From patchwork Mon Jan 20 10:13:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mukunda,Vijendar" X-Patchwork-Id: 13944986 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2045.outbound.protection.outlook.com [40.107.212.45]) (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 4DB9C1C07E7; Mon, 20 Jan 2025 10:14:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.212.45 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737368048; cv=fail; b=qU4xjL6OO852lYjUGXV/AeRv0MgqOmZkkCVy6f6cSxrfQshnojTlLdCpEc0lQFOYqRExag/Ec05eYUhAnJ65wiyKqmHu6B52glnxMV3vyhQym0hqXqmeaHJXoNlfTVZDmIZSzZgsy5V6cxrIcr8AijLhPeOXTpvo41muj7JUabI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737368048; c=relaxed/simple; bh=8wETD2CiblFdPNd7uMR2vz+JsM3atB2zGzf2bM4jXII=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=t/lSln9e3nzOGxfUe89DLrqbKceT6cFs/+RT4dzChPJ4rNfJNPOY//Te4mzJBLDjiEhwOYv5jQH9w7/vCEhui2dYGtdsqCqNORMUp+kn/2U2DYl9Y8u/biRJ7xZPVbKlPY46Z79dcf1qfLSqlF36/5gEXtu97JL8aJ5yUjM9XHI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=AKhEuQ1I; arc=fail smtp.client-ip=40.107.212.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="AKhEuQ1I" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tninXX1SWmr9mLMbOTuLAmTQpmoKN51CtZjQxdE9xp5z3eAL4NkF4GhJjUD3RvbQVzOQeJsVVlgP2foP5FqKMprlIEvklH28CW05YQpq6ovcg3sam41PgEhUKSawDUCPzeP/Le9cDIlwZsOiUDW6LDNnKgRU8dyolRiQfC4VUaooAEXdwnQs9vtUSWcmIsaO1r+lxKq2lkeT1rXNdghVWGDUV2tqyLZ+nMCqy6zPchxASt+HUKn4GD59H+1dLMic2d27zx3Kmx9gQWbjDfD+kBf7srtMIXZr25WqpbDSEUUVh33mzYXpte3CxRRP5sazHkR20DC4So/iL+6vP8hudA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=P7sUVlFmCGQS8oRmNUor2lzsBlfZBpnlJn0jCCIImqU=; b=EE6suCAtT17IsSzVbnpzrSA0+q1MjYKfOJcQnhFWATqk424ws4Zq6OWU8sdz78eVsEEajHxgM2lpq9CmY5q9rO++X5ZTirQLVd86kX7zVYo3V31jlzq8iRs9WWB2fwkjefoJfAlCFsntea1srPDAQMkJC/okqlEAFGpVYbilcbziMlZAXKkwZWuG8XWhNrPKUYaH2BmrrvaqIztx5hVxkFVUe24bHkVY0eZj/efbSXVsx+ykA22MfNbXAQhuw8ET8q/T1YHu90VFV1wlmN9bgqywvGiC+/oG14FtJ/YVTqnwOlbpMlQmXqEvlzatw7nbnGn5b9is/mTIBfYtQH9nXg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=P7sUVlFmCGQS8oRmNUor2lzsBlfZBpnlJn0jCCIImqU=; b=AKhEuQ1IxwwV6JHikEfN0cnfG+Ji1OIsWYNW99XUWZJKet/BQAB6I0xQsVhSYfcsU4vidqGn/ORBn6ZZGXXHbbx96DLGGRxk006i0KC2ZX9W4nFTMaeTR6ii05yLMlDWM7Aqv9yE1sMqAvVldrppLufHlan5vkZilPdEntOQF04= Received: from BL0PR02CA0013.namprd02.prod.outlook.com (2603:10b6:207:3c::26) by SN7PR12MB8059.namprd12.prod.outlook.com (2603:10b6:806:32b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8356.20; Mon, 20 Jan 2025 10:14:01 +0000 Received: from BN3PEPF0000B36D.namprd21.prod.outlook.com (2603:10b6:207:3c:cafe::a6) by BL0PR02CA0013.outlook.office365.com (2603:10b6:207:3c::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8356.21 via Frontend Transport; Mon, 20 Jan 2025 10:14:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN3PEPF0000B36D.mail.protection.outlook.com (10.167.243.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8398.0 via Frontend Transport; Mon, 20 Jan 2025 10:14:01 +0000 Received: from vijendar-X570-GAMING-X.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 20 Jan 2025 04:13:57 -0600 From: Vijendar Mukunda To: CC: , , , , , , , , , , "Vijendar Mukunda" Subject: [PATCH V2 5/7] soundwire: amd: set device power state during suspend/resume sequence Date: Mon, 20 Jan 2025 15:43:27 +0530 Message-ID: <20250120101329.3713017-6-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250120101329.3713017-1-Vijendar.Mukunda@amd.com> References: <20250120101329.3713017-1-Vijendar.Mukunda@amd.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PEPF0000B36D:EE_|SN7PR12MB8059:EE_ X-MS-Office365-Filtering-Correlation-Id: 8ca63472-8b8f-4336-28c3-08dd393b2944 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: XzBrMfs0bGPIByjudBHF5kqmIkrxq6sVp57JqitG71GbHhrRblNNzNvH/m/9XLQiOoKbLeTOqoveNxOQBv1pCzwfJScFnk4bD7pYqwVU0ToEZgCkxSwsTqhXfAedBGjd41ChKmNPr2sB2ZLLACSOvshHvUvwYPQ0bJ/hTjpCccGjxsp8nx2XVU1eUmUlY4wYOzPdabmIxlYI0tLgjxU4Hno0T3EpTK0vVV3K9Z6vc0MwRBZjMhYT3Hnmg9FgOVFSWszjbvCWHPubcqyj4jrvRk+4gR867w0KFvo7N/T9/XDYZp0prKLFBYeRB8hCIDQ7GQduz9pbx2jWWF001bVbB176QgrsFBlKIzIMsRXavMKBthtSkZkcMWkCk94fjXI10kk1h0YX8jpqs8oiENi+DSRG6nTEQTZ6PCG6kf2v4xyKcr+RYYFjzzEt1wY+E5sY2XH5rVHGNqrXhdogsqIvttn2jZLa4ZDutm1sjm/J7VkH7FxCtWezNJWvzM/tedE1qFmRwyRPcEEZC8zoOXgWEksnw2EZdWRuaDWE15LEVBcvIrV0WorR7bvzeQUmh3NrR/IvfeGo4PCIqZKYMzVrgF4T86z2OP6JMRgInRqLeOLUZynEBaOLFo6f84qo4imzmueorScCC+hinagbyt8im8daPG+PChCkl8y806pXemLBUytnSYW/uoPf3ezSFdXS/NLrU1MR+fgJGvQzmMqjTARdDS0Zp4fh+TfNJd7NPinAmeNiLjGQ3mepE4gIo0OnJ7nd8JYkbOr/+liFZDmjZ6wxzn2D8acViCQxqoGK3N8AmsmYnmn3wEqNWYN/NX4ETFCNbyMkOpi2Hcv1Lak5snCLu+HwVxNxaMUrOdMixVGWr8MQJbJQW7pQoKE31gBl5tr0780WPYcJl7VkZ4L1tQ+j+xQ2J6LZrwBfJVX33fccu46lB6jkDpxt6nKqwRUSkQN+ngqxtVctmKhG+6dj/UVNRNvdhEy5Gf9DZLRovZTJ7I9arSsro/axl3mSk5B88yKeXGDWL55GEw6hVOm55JO7ABm4yqTaRLIbS1GLE6ab1JqVS1RDgMGNkOQWrpWwC86sksGnz35MTPyQxist/dsdJML7U6cyjMo+GXjWtOVudqxI7AWKx5MHSb47ojdjddyRgUqhB02b0Sfjz6UY+ChPwwwNWj/lFJThyYQLAbimlOKFgKJgNGpFNLZxwKI3WjPO1ZaMj+cYorM5VfanyMEmIWd+7jc92E5/nLKSS0tvSYOE6R2hgSgDUJtqTE3BOmYnS3aw6VOdU8AHJJuP2IUiBI7J0V8QNQIlTVmwz05odXmdReJgWlnb2JFKIBGxXPdfptN/Hf820QFuFn0QP79dpRpUd8ZRxIMy7glvSy9AZrQty1xrSHKxL5zBVhRVU0DiQmsVgA45G/eiBoLDqTtQeHfuIT9oqTN9yriYsRsMrYFBH9+R4sNmTfm9RkEBUfRjedYjfIKVc/KJIAB0C1bkCnUtyOlav4R/Cdk2q7c= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(376014)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2025 10:14:01.3883 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8ca63472-8b8f-4336-28c3-08dd393b2944 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN3PEPF0000B36D.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB8059 Set SoundWire manager device power state during suspend and resume sequence for ACP7.0 & ACP7.1 platforms. Signed-off-by: Vijendar Mukunda --- drivers/soundwire/amd_manager.c | 58 ++++++++++++++++++++++++++++++--- drivers/soundwire/amd_manager.h | 5 +++ 2 files changed, 58 insertions(+), 5 deletions(-) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c index d611498d5488..42d553878e91 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -143,6 +143,29 @@ static void amd_sdw_wake_enable(struct amd_sdw_manager *amd_manager, bool enable writel(wake_ctrl, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_MASK_8TO11); } +static int amd_sdw_set_device_state(struct amd_sdw_manager *amd_manager, u32 target_device_state) +{ + u32 sdw_dev_state; + + sdw_dev_state = readl(amd_manager->acp_mmio + AMD_SDW_DEVICE_STATE); + switch (amd_manager->instance) { + case ACP_SDW0: + u32p_replace_bits(&sdw_dev_state, target_device_state, + AMD_SDW0_DEVICE_STATE_MASK); + break; + case ACP_SDW1: + u32p_replace_bits(&sdw_dev_state, target_device_state, + AMD_SDW1_DEVICE_STATE_MASK); + break; + default: + return -EINVAL; + } + writel(sdw_dev_state, amd_manager->acp_mmio + AMD_SDW_DEVICE_STATE); + sdw_dev_state = readl(amd_manager->acp_mmio + AMD_SDW_DEVICE_STATE); + dev_dbg(amd_manager->dev, "AMD_SDW_DEVICE_STATE:0x%x\n", sdw_dev_state); + return 0; +} + static void amd_sdw_ctl_word_prep(u32 *lower_word, u32 *upper_word, struct sdw_msg *msg, int cmd_offset) { @@ -1163,7 +1186,9 @@ static int __maybe_unused amd_suspend(struct device *dev) if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) { amd_sdw_wake_enable(amd_manager, false); - return amd_sdw_clock_stop(amd_manager); + ret = amd_sdw_clock_stop(amd_manager); + if (ret) + return ret; } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) { amd_sdw_wake_enable(amd_manager, false); /* @@ -1173,7 +1198,14 @@ static int __maybe_unused amd_suspend(struct device *dev) ret = amd_sdw_clock_stop(amd_manager); if (ret) return ret; - return amd_deinit_sdw_manager(amd_manager); + ret = amd_deinit_sdw_manager(amd_manager); + if (ret) + return ret; + } + if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { + ret = amd_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D3); + if (ret) + return ret; } return 0; } @@ -1191,13 +1223,22 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev) } if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) { amd_sdw_wake_enable(amd_manager, true); - return amd_sdw_clock_stop(amd_manager); + ret = amd_sdw_clock_stop(amd_manager); + if (ret) + return ret; } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) { amd_sdw_wake_enable(amd_manager, true); ret = amd_sdw_clock_stop(amd_manager); if (ret) return ret; - return amd_deinit_sdw_manager(amd_manager); + ret = amd_deinit_sdw_manager(amd_manager); + if (ret) + return ret; + } + if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { + ret = amd_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D3); + if (ret) + return ret; } return 0; } @@ -1216,7 +1257,9 @@ static int __maybe_unused amd_resume_runtime(struct device *dev) } if (amd_manager->power_mode_mask & AMD_SDW_CLK_STOP_MODE) { - return amd_sdw_clock_stop_exit(amd_manager); + ret = amd_sdw_clock_stop_exit(amd_manager); + if (ret) + return ret; } else if (amd_manager->power_mode_mask & AMD_SDW_POWER_OFF_MODE) { writel(0x00, amd_manager->acp_mmio + ACP_SW_WAKE_EN(amd_manager->instance)); val = readl(amd_manager->mmio + ACP_SW_CLK_RESUME_CTRL); @@ -1239,6 +1282,11 @@ static int __maybe_unused amd_resume_runtime(struct device *dev) return ret; amd_sdw_set_frameshape(amd_manager); } + if (amd_manager->acp_rev >= ACP70_PCI_REV_ID) { + ret = amd_sdw_set_device_state(amd_manager, AMD_SDW_DEVICE_STATE_D0); + if (ret) + return ret; + } return 0; } diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manager.h index 30244a31c21c..8430f279d88e 100644 --- a/drivers/soundwire/amd_manager.h +++ b/drivers/soundwire/amd_manager.h @@ -194,6 +194,11 @@ #define AMD_SDW_CLK_RESUME_DONE 3 #define AMD_SDW_WAKE_STAT_MASK BIT(16) #define AMD_SDW_WAKE_INTR_MASK BIT(16) +#define AMD_SDW_DEVICE_STATE 0x1430 +#define AMD_SDW0_DEVICE_STATE_MASK GENMASK(1, 0) +#define AMD_SDW1_DEVICE_STATE_MASK GENMASK(3, 2) +#define AMD_SDW_DEVICE_STATE_D0 0 +#define AMD_SDW_DEVICE_STATE_D3 3 static u32 amd_sdw_freq_tbl[AMD_SDW_MAX_FREQ_NUM] = { AMD_SDW_DEFAULT_CLK_FREQ,