From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4CF97C282CE for ; Mon, 11 Feb 2019 15:10:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1B200222B9 for ; Mon, 11 Feb 2019 15:10:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549897849; bh=z6kU14J5OZBw9v07wVZj1U4EFp+ZC6k8AP9GcYtvqBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UgVeAqtAyV9PHBw1KbAwNf4oFISqr+fefkpuFdee3uOrTUhyTweMmwcO4aUIFwOa/ F2wockWN3crNgOx0qLMQyW3sc7mN1F54wAwcQZ0UiGrSkD2GUv95Wm55s1dMcPrk7H 22s3rcVbJ22tCD6gLeQrE6/HSQXUiy5gV3fqiYnA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403985AbfBKPKr (ORCPT ); Mon, 11 Feb 2019 10:10:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:60862 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403982AbfBKPKr (ORCPT ); Mon, 11 Feb 2019 10:10:47 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 1A859222B0; Mon, 11 Feb 2019 15:10:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549897846; bh=z6kU14J5OZBw9v07wVZj1U4EFp+ZC6k8AP9GcYtvqBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L/aG+TB7ZBtIwdIvhImJgzfTqZIN6t92jkk6zHqKUnQpKy9fu7VxRTJGxrEFpb9eU cjDbFbmY8jkYuLKeyiROUT9bf+AKI2tSrdWNIYjcfmEGHBlKkSbbPOEhwyFSdi/Y8+ 0W9Iy0vUE6l5k2vrS+wYiZ3e2OfDyRyYVoWpSy3c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Scott Bauer , Bjorn Helgaas , Keith Busch , Jon Derrick , Sushma Kalakota Subject: [PATCH 4.9 135/137] PCI: vmd: Free up IRQs on suspend path Date: Mon, 11 Feb 2019 15:20:16 +0100 Message-Id: <20190211141824.652182230@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141811.964925535@linuxfoundation.org> References: <20190211141811.964925535@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Scott Bauer commit e2b1820bd5d0962d6f271b0d47c3a0e38647df2f upstream. Free up the IRQs we request on the suspend path and reallocate them on the resume path. Fixes this error: CPU 111 disable failed: CPU has 9 vectors assigned and there are only 0 available. Error taking CPU111 down: -34 Non-boot CPUs are not disabled Enabling non-boot CPUs ... Signed-off-by: Scott Bauer Signed-off-by: Bjorn Helgaas Acked-by: Keith Busch Signed-off-by: Greg Kroah-Hartman Reviewed-by: Jon Derrick Signed-off-by: Sushma Kalakota --- drivers/pci/host/vmd.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) --- a/drivers/pci/host/vmd.c +++ b/drivers/pci/host/vmd.c @@ -731,6 +731,11 @@ static void vmd_remove(struct pci_dev *d static int vmd_suspend(struct device *dev) { struct pci_dev *pdev = to_pci_dev(dev); + struct vmd_dev *vmd = pci_get_drvdata(pdev); + int i; + + for (i = 0; i < vmd->msix_count; i++) + devm_free_irq(dev, pci_irq_vector(pdev, i), &vmd->irqs[i]); pci_save_state(pdev); return 0; @@ -739,6 +744,16 @@ static int vmd_suspend(struct device *de static int vmd_resume(struct device *dev) { struct pci_dev *pdev = to_pci_dev(dev); + struct vmd_dev *vmd = pci_get_drvdata(pdev); + int err, i; + + for (i = 0; i < vmd->msix_count; i++) { + err = devm_request_irq(dev, pci_irq_vector(pdev, i), + vmd_irq, IRQF_NO_THREAD, + "vmd", &vmd->irqs[i]); + if (err) + return err; + } pci_restore_state(pdev); return 0;