From patchwork Fri Sep 14 16:14:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Miroshnichenko X-Patchwork-Id: 10601015 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B06E614BD for ; Fri, 14 Sep 2018 16:21:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96DBD2B343 for ; Fri, 14 Sep 2018 16:21:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 89F952BBE0; Fri, 14 Sep 2018 16:21:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 307E82A448 for ; Fri, 14 Sep 2018 16:21:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728266AbeINVgo (ORCPT ); Fri, 14 Sep 2018 17:36:44 -0400 Received: from mta-01.yadro.com ([89.207.88.251]:60238 "EHLO mta-01.yadro.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726845AbeINVgo (ORCPT ); Fri, 14 Sep 2018 17:36:44 -0400 X-Greylist: delayed 441 seconds by postgrey-1.27 at vger.kernel.org; Fri, 14 Sep 2018 17:36:43 EDT Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 68C6A418FB; Fri, 14 Sep 2018 16:14:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yadro.com; h= content-type:content-type:mime-version:references:in-reply-to :x-mailer:message-id:date:date:subject:subject:from:from :received:received:received; s=mta-01; t=1536941652; x= 1538756053; bh=PdZSXUw7YG6FkWAzEo9haHTk94kYkJNqCMTtndwhZ3o=; b=q uJOKjOCndhZlW88T22tIt1X+LErWmsr8iW+CIkEzuFsRCh7sshsxusiuAfW26lGr kBk5/JhTjer3TXkQxt8qVVUqpxfo5DwHlc0SOnxK7ZC+9uKO5ZMG0IRWDk68Tqx2 e2KxcaK6s1qoIqEFmYd7WcjnS6x2rqD3cCMPhPr2Fw= X-Virus-Scanned: amavisd-new at yadro.com Received: from mta-01.yadro.com ([127.0.0.1]) by localhost (mta-01.yadro.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KBBTe_o-FZSg; Fri, 14 Sep 2018 19:14:12 +0300 (MSK) Received: from T-EXCH-02.corp.yadro.com (t-exch-02.corp.yadro.com [172.17.10.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mta-01.yadro.com (Postfix) with ESMTPS id 66EA9418BF; Fri, 14 Sep 2018 19:14:11 +0300 (MSK) Received: from NB-148.yadro.com (172.17.15.60) by T-EXCH-02.corp.yadro.com (172.17.10.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Fri, 14 Sep 2018 19:14:11 +0300 From: Sergey Miroshnichenko To: CC: Bjorn Helgaas , , Sergey Miroshnichenko Subject: [PATCH RFC 4/4] PCI: Fix writing invalid BARs during pci_restore_state() Date: Fri, 14 Sep 2018 19:14:04 +0300 Message-ID: <20180914161404.4685-5-s.miroshnichenko@yadro.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180914161404.4685-1-s.miroshnichenko@yadro.com> References: <20180914161404.4685-1-s.miroshnichenko@yadro.com> MIME-Version: 1.0 X-Originating-IP: [172.17.15.60] X-ClientProxiedBy: T-EXCH-01.corp.yadro.com (172.17.10.101) To T-EXCH-02.corp.yadro.com (172.17.10.102) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If BAR movement has happened (due to PCIe hotplug) after pci_save_state(), the saved addresses will become outdated. Restore them the most recently calculated values, not the ones stored in an arbitrary moment. Signed-off-by: Sergey Miroshnichenko --- drivers/pci/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 5f07a59b5924..154130959443 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1328,7 +1328,7 @@ static void pci_restore_config_space(struct pci_dev *pdev) if (pdev->hdr_type == PCI_HEADER_TYPE_NORMAL) { pci_restore_config_space_range(pdev, 10, 15, 0); /* Restore BARs before the command register. */ - pci_restore_config_space_range(pdev, 4, 9, 10); + pci_restore_bars(pdev); pci_restore_config_space_range(pdev, 0, 3, 0); } else { pci_restore_config_space_range(pdev, 0, 15, 0);