Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1556657pxb; Thu, 16 Sep 2021 09:51:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjTvU8b9yTasmqDOQt/1zAvWdcYO7D6ZfP8HFAj8ziTwIO0nQC6Av+G71Z681JKMOnRCyg X-Received: by 2002:a17:907:244a:: with SMTP id yw10mr7220188ejb.79.1631811064681; Thu, 16 Sep 2021 09:51:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631811064; cv=none; d=google.com; s=arc-20160816; b=r1BgU1p11gMJpakG+vCmyC6+ySdDEyGKoOLmz7SLc4KdAiRrA4G4b+mU00ykcz8tsZ qcp/+l4HhAht/PpT8xpX0J/aOnXyZV6jKYFVTP11IP+fDVru9C+yQUjQgkYdF0qYLEos 4FoV1pREQ+7Kugj0/4VWlJHEYTn/oX+dUHnafAL02iOwxbnZ/GBMd/R9peUzWQP19QPR Wx7+Fh0uAeHqk46DSMtGER+N+ygUgsGKD62fW5fcwWor7T6Llpc3/r2wWLHHngjZ5Gc9 gKAy4xUemuWvVQQNO182l86P1pVbu2ixy8Op/bvfKpit/cBfCHApxYH5Wr67qT577qGX 1vEg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Ql6o58pNDrJQNNli+6MrMJUViiNcY26u/UrlDgPovGk=; b=nMS7eUb8MsplB69XW9pPrumpFis+RSur3I6R5UJfzmsrZJofX0uNH28F9myPV3AJ94 JL0LJ5INS6kdvoMnGGla+NqGnYv/fGmb4nq4Bf96XqwG6vVasd8uexf7W+ubf/ALDxVV G4Qn54nheOvIsQHP4WIo4vvmcuDrE0dBHDbVBPTLVbyezfeoWlpGNJvLoX32tEFZdS8F BD/3qlqZfZTaKh9ou3Fwi65ElfUHvAiagIdiLmpFQTui+5Iw7mgrzcHDciQIyDV0KRdX xWcLxT1OX78yng8JgnkRAu089zhEv3enu3ttaJc2YbDpIPtnIuZybyph0cG+47lP46KV XBhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="IlSYDH/9"; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id de12si4006209edb.352.2021.09.16.09.50.39; Thu, 16 Sep 2021 09:51:04 -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=@linuxfoundation.org header.s=korg header.b="IlSYDH/9"; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344675AbhIPQqb (ORCPT + 99 others); Thu, 16 Sep 2021 12:46:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:51038 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245450AbhIPQk3 (ORCPT ); Thu, 16 Sep 2021 12:40:29 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7BF9C6147F; Thu, 16 Sep 2021 16:23:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631809433; bh=KpKH8o4i6PIgSJ1r6pt29OkXPG0DEy42939Vk8js6VY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IlSYDH/9DYSKL/H3DhXHHjkIAefa+LUCY3AC7KyNeULoaW3vpy/mVeJyG2Z/CuLLk BtsF8vzfvPr7EvA7gp+64/POBmXF69vUyBmOUzpFYMtwr3d33j2eHqkgwqgFgp2i6q v3yT0rsv2X16PtECGWXdHxcjd6CeZMaBZR96fLro= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Maximilian Luz , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 5.13 153/380] PCI: Use pci_update_current_state() in pci_enable_device_flags() Date: Thu, 16 Sep 2021 17:58:30 +0200 Message-Id: <20210916155809.264420011@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155803.966362085@linuxfoundation.org> References: <20210916155803.966362085@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rafael J. Wysocki [ Upstream commit 14858dcc3b3587f4bb5c48e130ee7d68fc2b0a29 ] Updating the current_state field of struct pci_dev the way it is done in pci_enable_device_flags() before calling do_pci_enable_device() may not work. For example, if the given PCI device depends on an ACPI power resource whose _STA method initially returns 0 ("off"), but the config space of the PCI device is accessible and the power state retrieved from the PCI_PM_CTRL register is D0, the current_state field in the struct pci_dev representing that device will get out of sync with the power.state of its ACPI companion object and that will lead to power management issues going forward. To avoid such issues, make pci_enable_device_flags() call pci_update_current_state() which takes ACPI device power management into account, if present, to retrieve the current power state of the device. Link: https://lore.kernel.org/lkml/20210314000439.3138941-1-luzmaximilian@gmail.com/ Reported-by: Maximilian Luz Signed-off-by: Rafael J. Wysocki Tested-by: Maximilian Luz Signed-off-by: Sasha Levin --- drivers/pci/pci.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index a9d0530b7846..8b3cb62c63cc 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1906,11 +1906,7 @@ static int pci_enable_device_flags(struct pci_dev *dev, unsigned long flags) * so that things like MSI message writing will behave as expected * (e.g. if the device really is in D0 at enable time). */ - if (dev->pm_cap) { - u16 pmcsr; - pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr); - dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK); - } + pci_update_current_state(dev, dev->current_state); if (atomic_inc_return(&dev->enable_cnt) > 1) return 0; /* already enabled */ -- 2.30.2