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 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CC554C8303C for ; Wed, 2 Jul 2025 11:29:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7EDF310E6F0; Wed, 2 Jul 2025 11:29:09 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="HraOaj7L"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4BDB610E6F0 for ; Wed, 2 Jul 2025 11:29:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1751455748; x=1782991748; h=from:date:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=ye5X6obKoSEg1H58wS5paYr733c6PnCpeelFGlRpih0=; b=HraOaj7LF/Tg5lYYgQskKP14BUTK4k2ngb9ZdSjLfabM/q3y/m6LnQhg +todF+Gfs7Bb4y71o/USCjoVW34S37Izz2LU854AiIFyf2MfO/3wPbAPi Hmc10s2Elxp+brIPbzDPaHcpGtvrsriRtS6vxWFgMACu5exS9s7gOjI2q Pq5AvR3pCNVgCYp+uBG44iLf+YwaUlJVh7p2vppkI6RF4+zQW27wTO5U3 FzZ51g3dBisKLSKLE4F+dFhvc2cSQ1Rjv0Rj1bVY5FMGsp2dmaDW+IieD Fsz/EqoDf3gFY1tR51PDfZz4W7BHwWwoMxR0sftAN9fNfUoaIBjfkysoX g==; X-CSE-ConnectionGUID: SS1MnJ85SHyaDdhlbkj5zw== X-CSE-MsgGUID: zRUi1AAIQGa273Zm7s4ejQ== X-IronPort-AV: E=McAfee;i="6800,10657,11481"; a="71312958" X-IronPort-AV: E=Sophos;i="6.16,281,1744095600"; d="scan'208";a="71312958" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jul 2025 04:29:07 -0700 X-CSE-ConnectionGUID: 6LQ9sz59SMmbijbCNfm0/Q== X-CSE-MsgGUID: 8wdgoqVFRg63/w0PtLAeew== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,281,1744095600"; d="scan'208";a="153820832" Received: from ijarvine-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.245.228]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jul 2025 04:29:02 -0700 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Date: Wed, 2 Jul 2025 14:28:59 +0300 (EEST) To: Badal Nilawar cc: intel-xe@lists.freedesktop.org, linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org, anshuman.gupta@intel.com, "Rafael J. Wysocki" , lenb@kernel.org, bhelgaas@google.com, lucas.demarchi@intel.com, rodrigo.vivi@intel.com, varun.gupta@intel.com, ville.syrjala@linux.intel.com, uma.shankar@intel.com Subject: Re: [PATCH v4 02/11] PCI/ACPI: Per root port allow one Aux power limit request In-Reply-To: <20250529111654.3140766-3-badal.nilawar@intel.com> Message-ID: References: <20250529111654.3140766-1-badal.nilawar@intel.com> <20250529111654.3140766-3-badal.nilawar@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On Thu, 29 May 2025, Badal Nilawar wrote: > For given root port allow one Aux power limit request. > > Cc: Rafael J. Wysocki > Cc: Anshuman Gupta > Signed-off-by: Badal Nilawar > --- > drivers/acpi/scan.c | 1 + > drivers/pci/pci-acpi.c | 25 ++++++++++++++++++++++++- > include/acpi/acpi_bus.h | 2 ++ > 3 files changed, 27 insertions(+), 1 deletion(-) > > diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c > index fb1fe9f3b1a3..9ae7be9db01a 100644 > --- a/drivers/acpi/scan.c > +++ b/drivers/acpi/scan.c > @@ -745,6 +745,7 @@ int acpi_device_add(struct acpi_device *device) > INIT_LIST_HEAD(&device->physical_node_list); > INIT_LIST_HEAD(&device->del_list); > mutex_init(&device->physical_node_lock); > + mutex_init(&device->power.aux_pwr_lock); Hi, mutex_destroy() also exists but I don't find any added by this patch? I think the pre-existing mutex might also have this same problem. > > mutex_lock(&acpi_device_lock); > > diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c > index 87f30910a5f1..d33efba4ca94 100644 > --- a/drivers/pci/pci-acpi.c > +++ b/drivers/pci/pci-acpi.c > @@ -1451,6 +1451,7 @@ int pci_acpi_request_d3cold_aux_power(struct pci_dev *dev, u32 requested_power, > union acpi_object *out_obj; > acpi_handle handle; > int result, ret = -EINVAL; > + struct acpi_device *adev; > > if (!dev || !retry_interval) > return -EINVAL; > @@ -1464,11 +1465,27 @@ int pci_acpi_request_d3cold_aux_power(struct pci_dev *dev, u32 requested_power, > return -ENODEV; > } > > + adev = ACPI_COMPANION(&dev->dev); > + if (!adev) > + return -EINVAL; > + > + mutex_lock(&adev->power.aux_pwr_lock); > + > + /* Check if aux power already granted */ > + if (adev->power.aux_power_limit) { > + pci_info(dev, "D3cold Aux Power request already granted: %u mW\n", > + adev->power.aux_power_limit); > + mutex_unlock(&adev->power.aux_pwr_lock); > + return -EPERM; > + } > + > out_obj = acpi_evaluate_dsm_typed(handle, &pci_acpi_dsm_guid, 4, > DSM_PCI_D3COLD_AUX_POWER_LIMIT, > &in_obj, ACPI_TYPE_INTEGER); > - if (!out_obj) > + if (!out_obj) { > + mutex_unlock(&adev->power.aux_pwr_lock); > return -EINVAL; > + } > > result = out_obj->integer.value; > if (retry_interval) > @@ -1478,14 +1495,17 @@ int pci_acpi_request_d3cold_aux_power(struct pci_dev *dev, u32 requested_power, > case 0x0: > pci_dbg(dev, "D3cold Aux Power %u mW request denied\n", > requested_power); > + adev->power.aux_power_limit = 0; > break; > case 0x1: > pci_info(dev, "D3cold Aux Power request granted: %u mW\n", > requested_power); > + adev->power.aux_power_limit = requested_power; > ret = 0; > break; > case 0x2: > pci_info(dev, "D3cold Aux Power: Main power won't be removed\n"); > + adev->power.aux_power_limit = 0; > ret = -EBUSY; > break; > default: > @@ -1500,9 +1520,12 @@ int pci_acpi_request_d3cold_aux_power(struct pci_dev *dev, u32 requested_power, > pci_err(dev, "D3cold Aux Power: Reserved or unsupported response: 0x%x\n", > result); > } > + adev->power.aux_power_limit = 0; > break; > } > > + mutex_unlock(&adev->power.aux_pwr_lock); > + > ACPI_FREE(out_obj); > return ret; > } > diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h > index aad1a95e6863..c4ce3d84be00 100644 > --- a/include/acpi/acpi_bus.h > +++ b/include/acpi/acpi_bus.h > @@ -294,6 +294,8 @@ struct acpi_device_power { > struct acpi_device_power_flags flags; > struct acpi_device_power_state states[ACPI_D_STATE_COUNT]; /* Power states (D0-D3Cold) */ > u8 state_for_enumeration; /* Deepest power state for enumeration */ > + u32 aux_power_limit; /* aux power limit granted by bios */ > + struct mutex aux_pwr_lock; /* prevent concurrent aux power limit requests */ > }; > > struct acpi_dep_data { > -- i.