From patchwork Mon Feb 20 10:04:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mukunda,Vijendar" X-Patchwork-Id: 59349 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1228149wrn; Mon, 20 Feb 2023 02:18:27 -0800 (PST) X-Google-Smtp-Source: AK7set87aAxTdN1js7N7AtkKLZFAiQ2Ph7unWanNGSZLuA/3PGeEs8n845HA2UKyr7OSYWhzn5YE X-Received: by 2002:a17:90b:4b4c:b0:229:649a:9a05 with SMTP id mi12-20020a17090b4b4c00b00229649a9a05mr2359656pjb.11.1676888307133; Mon, 20 Feb 2023 02:18:27 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1676888307; cv=pass; d=google.com; s=arc-20160816; b=j7Ba+yXC8IHM7Cx0PL3vKOGzVRJ93jv9AiRsxN3kyT4VhJDDvBfu97N6fMTokLO28A jEIeqwxf9jGL2bPKyiK+xE2XraKYoSQoJrh7B9J4YT5wzW2yDZQY99Fa6/pJ+DMnYJvk tMYuRJCYtAxokqEIUs27d7ZahGiSzNBaIUQhz/VyRkR0Lvt0lfyV4YCyZGW235UwbG9k +uSyDOcYVFaUWMGTMC/A2mqEKhk5Aa1DRWl3uuWeLA6LtzRNUF7m7ym6VIrma3LpHku9 t8iakTNwTWdgs91j+7FIkZJaxwBUJKb3wEC6OaMzarzqG+80r3LG5msm9SZqE7h4uN0u zuGw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mhzE+LILTJ8+DkN8t2RcWFJyo908glnQM7JXFMy/obA=; b=d2zllr/OBqsgbRh1Q1fX44u7QydqxlcgRzYChpvMmdUrh+nr91IQVvx1Czy61+iSmI FLlDmWBuTpYWtCXoLTVek6nJpaDbL6ejWKFawA4c7713bBkhmqH9QlpcDnDoK40tADXL kvIlpkTewLSRqijrJ3lCtvAGSomlF2fvtcR9oeN2YEjY2gEP3R1tKluFVkQkSOWMislr f5mU/dhIiNK2/nBWYFBnBPiTvPbnkX91GgkIra/whfoOnvP8EeIHxEHmR1xQLdJTpsfW DFK3J8m7RKxHtE3Qi8jq+Sg2HdzKrlvl6kc50aZG6OGYMIPYqZ2LN58q64/QxrozVrff MV6A== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=v5LQj+Yl; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s4-20020a17090a880400b00233d8167b94si14456356pjn.84.2023.02.20.02.18.14; Mon, 20 Feb 2023 02:18:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=v5LQj+Yl; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231506AbjBTKCV (ORCPT + 99 others); Mon, 20 Feb 2023 05:02:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231447AbjBTKCD (ORCPT ); Mon, 20 Feb 2023 05:02:03 -0500 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2DCC18B36 for ; Mon, 20 Feb 2023 02:01:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YSDhcbpjHinjmsPrrKiE51Kmt2DLTI9K1rfIxZOzPgYc6M4uqgUEvRECJyzCq2U2wJvYVycTGPGICrqElWZl6wKzIidHrYMuvxE4q5zUp67r2EiKEKEkyf/ebQFC943V5aXRGpYBKrZH3Hrx49ncHSb5NIlY2+OMRN2V9NfymjWa49iIjkJDhQkI3Qe1aGURg8TL2C9dGP1CwwUOSmxa4i57U/y4Cz1ekz57P2+zOTVP+SS4kqmL5o0BVzvhoCY9BmudArnvO9DUE+p6vz+ZwLtBNG5LVpQYoPMyFCy0wA6GkF8F6qrfLSO9VDzscyP1bLw2U8ArB7h97ECcoy7/5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=mhzE+LILTJ8+DkN8t2RcWFJyo908glnQM7JXFMy/obA=; b=M+u9Wr4IPBE1oo7niU4U0C6fqAKY8qCPM/BXZkWhVxCsbIcW86A6bTCOArqIbE6Ii4aNT7PNYXq3yqhxhHwfb8v+TZx1st8F5QYgxnJe36CiInlYf3cdz6+zz50W75lkvZaqJl7u+1V5F+nWqEb6AOEoyBjBYMY79vc0dqmso/tdaKbRaVuOBkt/YyCePeu4HWpJJJ1cPOV2ZtjZNBE/RszHVeASKyV8xyphjfiBSuwLGUioOcXz/p8aE7qAjDQaCOS4aWWDU6/+ekRs04dNfgTy7J50lrOxMSc+WAuT3LCCPi8CdjH60a7pPVck1lVwh1oFvTFyo0sBlw4PbZr1DA== 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 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=mhzE+LILTJ8+DkN8t2RcWFJyo908glnQM7JXFMy/obA=; b=v5LQj+YlacL1gcNmV8LUHmmn7ftRNF9mdtAiodIOBDAzT7MGNZGIKWY6Rx5/PmesBoRBlw83PUpWLyTh/2x8jzws2NQpJxVfiLXLIk1X8ZOnGfh9LYHmC/SjWwOyF6rsSaQketABOAiFFvI/e40H278AUx2s9Wg+tZZG9X2yAUQ= Received: from MW4PR03CA0347.namprd03.prod.outlook.com (2603:10b6:303:dc::22) by SA0PR12MB7001.namprd12.prod.outlook.com (2603:10b6:806:2c0::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.26; Mon, 20 Feb 2023 10:01:52 +0000 Received: from CO1NAM11FT110.eop-nam11.prod.protection.outlook.com (2603:10b6:303:dc:cafe::dc) by MW4PR03CA0347.outlook.office365.com (2603:10b6:303:dc::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.19 via Frontend Transport; Mon, 20 Feb 2023 10:01:52 +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=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1NAM11FT110.mail.protection.outlook.com (10.13.175.125) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6111.20 via Frontend Transport; Mon, 20 Feb 2023 10:01:51 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 20 Feb 2023 04:01:51 -0600 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB06.amd.com (10.181.40.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 20 Feb 2023 04:01:50 -0600 Received: from vijendar-X570-GAMING-X.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Mon, 20 Feb 2023 04:01:47 -0600 From: Vijendar Mukunda To: CC: , , , , , , , , Vijendar Mukunda , Bard Liao , Sanyog Kale , open list Subject: [PATCH V3 5/8] soundwire: amd: add SoundWire manager interrupt handling Date: Mon, 20 Feb 2023 15:34:15 +0530 Message-ID: <20230220100418.76754-6-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230220100418.76754-1-Vijendar.Mukunda@amd.com> References: <20230220100418.76754-1-Vijendar.Mukunda@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT110:EE_|SA0PR12MB7001:EE_ X-MS-Office365-Filtering-Correlation-Id: b05cdc4b-8a5f-452d-803b-08db13297d5d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2E3zeZj+3vy5dY4Zn5G0dX4KEpK0VcAlEvOkoLtoce679NJzi2V3aBOopkZWDYO+u6L9AtND2doDozgjzqCsBFyBrwDvZWW0LXGQQ2R+zRZfbaXNWREupWBb9qchtmmnpZtWKq11AiH0mPJD4vZZpoh1xMOu7k7rbLqI3x7oQ2TtAsRW6fkUgbXUqz2EXOO+hkH69UoNtGA2CjrebgZQFmrmAgdTnZ+gbNM3gNZ0Ss79nMs1uVM1CBeJpu+VAUb8CVzElXioGfay45mrosTxEYuMgNVZ/BkpLNA/0Fn3+PNrM5KN7SyCLgrVWxRX3oMTloY+ZVYjZpWfuwsJWreZN9HwObu+I95SjI8jZ0kfMfHvug458NmO7i4PV6y3zcictg0yzode/tBzkcPxmy6dxk9Nwih3EU7khP4gVloUPqDtnAz7SlQDGCB0DI2eLaZoYkRdYydx+oDVowqm9GIDe866hPiuqpfMqb41Y7JR8fu7/FRHyBZqMFzPszGx6ycJzD8rj3ayAkK3eaJdyhsXVkAc6rlbhhNibh4vWPoHyz9eiYGjYhcoE3YjWQG9M3gkN1H/4b0JHhd7pj7O8siMIHgsPD1c6f3KYExa7+KilzTrNzBv6AvPsKDTE1jAxEo/R/qBfBATmjSQISIlt/47KM43/k0bcTiJiMfzzCsGkvIKi3yMnYFwaZJHAhYDx1zbMy/28r7Dh5giXqjjsmVY4b8ywwGoMlG33rFx4E0VmaY= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(346002)(396003)(136003)(39860400002)(376002)(451199018)(40470700004)(36840700001)(46966006)(82310400005)(2906002)(8936002)(36860700001)(47076005)(83380400001)(40480700001)(426003)(1076003)(5660300002)(36756003)(41300700001)(2616005)(186003)(82740400003)(26005)(336012)(478600001)(6666004)(86362001)(356005)(4326008)(6916009)(70586007)(316002)(70206006)(54906003)(8676002)(40460700003)(81166007)(7696005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2023 10:01:51.9361 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b05cdc4b-8a5f-452d-803b-08db13297d5d 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=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT110.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB7001 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758344833368858552?= X-GMAIL-MSGID: =?utf-8?q?1758344833368858552?= Add support for handling SoundWire manager interrupts. Signed-off-by: Vijendar Mukunda Signed-off-by: Mastan Katragadda --- drivers/soundwire/amd_manager.c | 130 ++++++++++++++++++++++++++++++ drivers/soundwire/amd_manager.h | 1 + include/linux/soundwire/sdw_amd.h | 6 ++ 3 files changed, 137 insertions(+) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c index 6aab738dcb45..5d9f0a9b2dfd 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -417,6 +417,51 @@ static enum sdw_command_response amd_sdw_xfer_msg(struct sdw_bus *bus, struct sd return SDW_CMD_OK; } +static void amd_sdw_fill_slave_status(struct amd_sdw_manager *amd_manager, u16 index, u32 status) +{ + switch (status) { + case SDW_SLAVE_ATTACHED: + amd_manager->status[index] = SDW_SLAVE_ATTACHED; + break; + case SDW_SLAVE_UNATTACHED: + amd_manager->status[index] = SDW_SLAVE_UNATTACHED; + break; + case SDW_SLAVE_ALERT: + amd_manager->status[index] = SDW_SLAVE_ALERT; + break; + default: + amd_manager->status[index] = SDW_SLAVE_RESERVED; + break; + } +} + +static void amd_sdw_process_ping_status(u64 response, struct amd_sdw_manager *amd_manager) +{ + u64 slave_stat; + u32 val; + u16 dev_index; + + /* slave status response */ + slave_stat = FIELD_GET(AMD_SDW_MCP_SLAVE_STAT_0_3, response); + slave_stat |= FIELD_GET(AMD_SDW_MCP_SLAVE_STAT_4_11, response) << 8; + dev_dbg(amd_manager->dev, "slave_stat:0x%llx\n", slave_stat); + for (dev_index = 0; dev_index <= SDW_MAX_DEVICES; ++dev_index) { + val = (slave_stat >> (dev_index * 2)) & AMD_SDW_MCP_SLAVE_STATUS_MASK; + dev_dbg(amd_manager->dev, "val:0x%x\n", val); + amd_sdw_fill_slave_status(amd_manager, dev_index, val); + } +} + +static void amd_sdw_read_and_process_ping_status(struct amd_sdw_manager *amd_manager) +{ + u64 response; + + mutex_lock(&amd_manager->bus.msg_lock); + response = amd_sdw_send_cmd_get_resp(amd_manager, 0, 0); + mutex_unlock(&amd_manager->bus.msg_lock); + amd_sdw_process_ping_status(response, amd_manager); +} + static u32 amd_sdw_read_ping_status(struct sdw_bus *bus) { struct amd_sdw_manager *amd_manager = to_amd_sdw(bus); @@ -817,6 +862,89 @@ static int amd_sdw_register_dais(struct amd_sdw_manager *amd_manager) dais, num_dais); } +static void amd_sdw_update_slave_status_work(struct work_struct *work) +{ + struct amd_sdw_manager *amd_manager = + container_of(work, struct amd_sdw_manager, amd_sdw_work); + int retry_count = 0; + + if (amd_manager->status[0] == SDW_SLAVE_ATTACHED) { + acp_reg_writel(0, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_MASK_0TO7); + acp_reg_writel(0, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_MASK_8TO11); + } + +update_status: + sdw_handle_slave_status(&amd_manager->bus, amd_manager->status); + /* + * During the peripheral enumeration sequence, the SoundWire manager interrupts + * are masked. Once the device number programming is done for all peripherals, + * interrupts will be unmasked. Read the peripheral device status from ping command + * and process the response. This sequence will ensure all peripheral devices enumerated + * and initialized properly. + */ + if (amd_manager->status[0] == SDW_SLAVE_ATTACHED) { + if (retry_count++ < SDW_MAX_DEVICES) { + acp_reg_writel(AMD_SDW_IRQ_MASK_0TO7, amd_manager->mmio + + ACP_SW_STATE_CHANGE_STATUS_MASK_0TO7); + acp_reg_writel(AMD_SDW_IRQ_MASK_8TO11, + amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_MASK_8TO11); + amd_sdw_read_and_process_ping_status(amd_manager); + goto update_status; + } else { + dev_err_ratelimited(amd_manager->dev, + "Device0 detected after %d iterations\n", + retry_count); + } + } +} + +static void amd_sdw_update_slave_status(u32 status_change_0to7, u32 status_change_8to11, + struct amd_sdw_manager *amd_manager) +{ + u64 slave_stat; + u32 val; + int dev_index; + + if (status_change_0to7 == AMD_SDW_SLAVE_0_ATTACHED) + memset(amd_manager->status, 0, sizeof(amd_manager->status)); + slave_stat = status_change_0to7; + slave_stat |= FIELD_GET(AMD_SDW_MCP_SLAVE_STATUS_8TO_11, status_change_8to11) << 32; + dev_dbg(amd_manager->dev, "status_change_0to7:0x%x status_change_8to11:0x%x\n", + status_change_0to7, status_change_8to11); + if (slave_stat) { + for (dev_index = 0; dev_index <= SDW_MAX_DEVICES; ++dev_index) { + if (slave_stat & AMD_SDW_MCP_SLAVE_STATUS_VALID_MASK(dev_index)) { + val = (slave_stat >> AMD_SDW_MCP_SLAVE_STAT_SHIFT_MASK(dev_index)) & + AMD_SDW_MCP_SLAVE_STATUS_MASK; + amd_sdw_fill_slave_status(amd_manager, dev_index, val); + } + } + } +} + +static void amd_sdw_irq_thread(struct work_struct *work) +{ + struct amd_sdw_manager *amd_manager = + container_of(work, struct amd_sdw_manager, amd_sdw_irq_thread); + u32 status_change_8to11; + u32 status_change_0to7; + + status_change_8to11 = acp_reg_readl(amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_8TO11); + status_change_0to7 = acp_reg_readl(amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_0TO7); + dev_dbg(amd_manager->dev, "[SDW%d] SDW INT: 0to7=0x%x, 8to11=0x%x\n", + amd_manager->instance, status_change_0to7, status_change_8to11); + if (status_change_8to11 & AMD_SDW_PREQ_INTR_STAT) { + amd_sdw_read_and_process_ping_status(amd_manager); + } else { + /* Check for the updated status on peripheral device */ + amd_sdw_update_slave_status(status_change_0to7, status_change_8to11, amd_manager); + } + if (status_change_8to11 || status_change_0to7) + schedule_work(&amd_manager->amd_sdw_work); + acp_reg_writel(0x00, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_8TO11); + acp_reg_writel(0x00, amd_manager->mmio + ACP_SW_STATE_CHANGE_STATUS_0TO7); +} + static void amd_sdw_probe_work(struct work_struct *work) { struct amd_sdw_manager *amd_manager = container_of(work, struct amd_sdw_manager, @@ -909,6 +1037,8 @@ static int amd_sdw_manager_probe(struct platform_device *pdev) return ret; } dev_set_drvdata(dev, amd_manager); + INIT_WORK(&amd_manager->amd_sdw_irq_thread, amd_sdw_irq_thread); + INIT_WORK(&amd_manager->amd_sdw_work, amd_sdw_update_slave_status_work); INIT_WORK(&amd_manager->probe_work, amd_sdw_probe_work); /* * Instead of having lengthy probe sequence, spilt probe in two and diff --git a/drivers/soundwire/amd_manager.h b/drivers/soundwire/amd_manager.h index 3e1bded1e769..5bcaf7a763bb 100644 --- a/drivers/soundwire/amd_manager.h +++ b/drivers/soundwire/amd_manager.h @@ -186,6 +186,7 @@ #define AMD_SDW1_PAD_KEEPER_EN_MASK 0x10 #define AMD_SDW0_PAD_KEEPER_DISABLE_MASK 0x1E #define AMD_SDW1_PAD_KEEPER_DISABLE_MASK 0xF +#define AMD_SDW_PREQ_INTR_STAT BIT(19) enum amd_sdw_cmd_type { AMD_SDW_CMD_PING = 0, diff --git a/include/linux/soundwire/sdw_amd.h b/include/linux/soundwire/sdw_amd.h index ffbe0d1eaeef..6d1007e96a1e 100644 --- a/include/linux/soundwire/sdw_amd.h +++ b/include/linux/soundwire/sdw_amd.h @@ -45,6 +45,8 @@ struct sdw_amd_dai_runtime { * @mmio: SoundWire registers mmio base * @acp_mmio: acp registers mmio base * @reg_mask: register mask structure per manager instance + * @amd_sdw_irq_thread: SoundWire manager irq workqueue + * @amd_sdw_work: peripheral status work queue * @probe_work: SoundWire manager probe workqueue * @sdw_lock: mutex to protect acp share register access * @num_din_ports: number of input ports @@ -65,10 +67,14 @@ struct amd_sdw_manager { void __iomem *acp_mmio; struct sdw_manager_reg_mask *reg_mask; + struct work_struct amd_sdw_irq_thread; + struct work_struct amd_sdw_work; struct work_struct probe_work; /* mutex to protect acp common register access */ struct mutex *acp_sdw_lock; + enum sdw_slave_status status[SDW_MAX_DEVICES + 1]; + int num_din_ports; int num_dout_ports;