From patchwork Fri May 23 19:01:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nilawar, Badal" X-Patchwork-Id: 892993 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1033929ACE5; Fri, 23 May 2025 18:59:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748026799; cv=none; b=UqDUZBI1Nl7h+uJzN6j96Wi8dKw3y9MHJJ0yC+E6chFcb5EiO+nx2wDZf1oNvnGBmerE/Iy/j7MF5RH0Wlg2SrrcSN2Fk0EF3LTJIzLQtL3iTzw0hLVHkJL37fanOisdMQkwMpOKGjhs2TTW+HGaz8m411Toqn8lQmIMGHtSVMY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748026799; c=relaxed/simple; bh=QQLgSrDm1RsgDz5vL/NtHO9UusnR/CSWpW8ZzGV0fM8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=H0RHwpN9A0bIHUTxeit82kj/zZ4TA71wI1iZ2wtfNikTKTCCmjNKhVQTbYzHE9AR1OXZPj2YQmKpuspRN9Bu5f45p+MMqujRZ2lHtuG0QSIyeJfr+Je++sYYa7kr8Mmtku0ABwZ+Mnh6A21APRkDx6pIouPwS2Y4jzBnqDYzP6Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=R4HCQ9/b; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="R4HCQ9/b" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1748026798; x=1779562798; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QQLgSrDm1RsgDz5vL/NtHO9UusnR/CSWpW8ZzGV0fM8=; b=R4HCQ9/bBBmPEOas5tAJaa4g2iSsn+upUmWGkwIQWeKCVA6EUBDqPIxB fFXRPVHOxWdfFDlD79dJkPafVfvd/KYec4sPoq1PdMuGtmZ18ghXl9VXU ssla6Erpj1cy4DTfcViwZInFIp8bt5t6X6MxcZX7rMkhC3HS6pgyotcNs Os7FbZ0u6mn/wovVUhX6OT/GHrG/sW/5EuOi/zXfy5ouUPyWMsA9f8TPC /wSmWIpEF3pRtgE63UFRIRuTqGp5cvl/t/UPKQgURdVg0giRSkt5KygYO nc3Y3cnaGNg+lLf2wIrb/35SwdpYAdSaA9cqo1Lo1uFF5DX68M5vvAy7k w==; X-CSE-ConnectionGUID: TQPwNgG/Q5O49QjsaAo8XA== X-CSE-MsgGUID: dlM1umlYR7qz9T3ZOeEhCQ== X-IronPort-AV: E=McAfee;i="6700,10204,11441"; a="61498448" X-IronPort-AV: E=Sophos;i="6.15,309,1739865600"; d="scan'208";a="61498448" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 May 2025 11:59:55 -0700 X-CSE-ConnectionGUID: IuCQ7L9rTXqxj/2syEb9Vg== X-CSE-MsgGUID: mkH7DkNtRiqSxpqY56sQoA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,309,1739865600"; d="scan'208";a="141758870" Received: from unknown (HELO bnilawar-desk2.iind.intel.com) ([10.190.239.41]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 May 2025 11:59:51 -0700 From: Badal Nilawar To: intel-xe@lists.freedesktop.org, linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org Cc: anshuman.gupta@intel.com, rafael@kernel.org, lenb@kernel.org, bhelgaas@google.com, ilpo.jarvinen@linux.intel.com, lucas.demarchi@intel.com, rodrigo.vivi@intel.com, varun.gupta@intel.com, ville.syrjala@linux.intel.com, uma.shankar@intel.com Subject: [PATCH v3 02/11] PCI/ACPI: Per root port allow one Aux power limit request Date: Sat, 24 May 2025 00:31:46 +0530 Message-Id: <20250523190155.2623462-3-badal.nilawar@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250523190155.2623462-1-badal.nilawar@intel.com> References: <20250523190155.2623462-1-badal.nilawar@intel.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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); mutex_lock(&acpi_device_lock); diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index 76b19525535f..53ba67678c3d 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) 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 {