From patchwork Thu Jul 8 18:08:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 471273 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp525935jao; Thu, 8 Jul 2021 11:09:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkLqiIq5qr0X28/p1uEVWRdEqsWebq/jAnAr6igMQhe9fjM1t37T5PL22MR1Hltg2H2ckH X-Received: by 2002:a17:907:2d2a:: with SMTP id gs42mr27662829ejc.371.1625767746265; Thu, 08 Jul 2021 11:09:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625767746; cv=none; d=google.com; s=arc-20160816; b=uKd1ilbsdReK7r/JbRAshiFXhmNp43jCdyw/elCZgyStiEnL5wFMMrJIifdk1siPnL Dlib9mULBddZ00nOLItafhYjGFzUkWdXKVC6i+QtOM722O4ns3UjKYE1BFqw/pwjlBj4 3jeimiP5kKvqo08DyAWNaUV9vdqqqwobC2+v1BvGe++AmmqUmSIMdDJvQinmwetyiheY RmBw5uy/pgrGYU60WGivGYXmzEKd1prgoDCA9fJe3pJuAtv63VGbp6gPy5ys0RGq8kVZ gd340MzVOze5JIYP66k8Bpaex0R447EtJuvoCaw0VhAKrC+z/RXCBzjfmRYLGhJwEpIK 1oAA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ElF5NgDZMWS9QbkjtrnSqMJNc007ajCK6vpTZuNyszA=; b=ARA12n2WD5QIrZ5/HCrZm11oY21yMW68aFqWtipaFxXtPgkOCPzDzoDzJy5sdJXgII 09H59EF5/Z/71cJ/js9PlzUMLOkZNf9JWhqJCzg/OOmPnj7kd92cDu/5R4xygCc3E7lK 6GxXB6NrPcarUrmmzIz6Da6wiX9WarZB4cs9ei8ZODGMfVq2Y13nASgVewpZxqNU2Hiw PrGpbG37C7dIL13Q4zikKuuKtTueYZQLxSw2kBHtreLbwg62zXKn9s3BFqgv4fcq5NRt VoWw5ad3FxNkZGKYpO8AHol12xpj9wo00VKZ0HeO/SWd3qlUSw4X2ffDoZifwK3rf6sg yL0w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 24si3945545ejw.232.2021.07.08.11.09.06; Thu, 08 Jul 2021 11:09:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230166AbhGHSLr (ORCPT + 4 others); Thu, 8 Jul 2021 14:11:47 -0400 Received: from foss.arm.com ([217.140.110.172]:35992 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230211AbhGHSLp (ORCPT ); Thu, 8 Jul 2021 14:11:45 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3D5EED6E; Thu, 8 Jul 2021 11:09:03 -0700 (PDT) Received: from usa.arm.com (e103737-lin.cambridge.arm.com [10.1.197.49]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 579543F66F; Thu, 8 Jul 2021 11:09:02 -0700 (PDT) From: Sudeep Holla To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sudeep Holla , Cristian Marussi , "Rafael J . Wysocki" , Jassi Brar Subject: [PATCH 04/13] mailbox: pcc: Consolidate subspace interrupt information parsing Date: Thu, 8 Jul 2021 19:08:42 +0100 Message-Id: <20210708180851.2311192-5-sudeep.holla@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210708180851.2311192-1-sudeep.holla@arm.com> References: <20210708180851.2311192-1-sudeep.holla@arm.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Extended PCC subspaces(Type 3 and 4) differs from generic(Type 0) and HW-Reduced Communication(Type 1 and 2) subspace structures. However some fields share same offsets and same type of structure can be use to extract the fields. In order to simplify that, let us move all the IRQ related information parsing into pcc_parse_subspace_irq and consolidate there. It will be easier to extend it if required within the same. Signed-off-by: Sudeep Holla --- drivers/mailbox/pcc.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) -- 2.25.1 Reviewed-by: Cristian Marussi diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c index c5f481a615b0..55866676a508 100644 --- a/drivers/mailbox/pcc.c +++ b/drivers/mailbox/pcc.c @@ -404,18 +404,26 @@ static int parse_pcc_subspace(union acpi_subtable_headers *header, /** * pcc_parse_subspace_irq - Parse the PCC IRQ and PCC ACK register - * There should be one entry per PCC client. - * @id: PCC subspace index. - * @pcct_ss: Pointer to the ACPI subtable header under the PCCT. + * + * @pchan: Pointer to the PCC channel info structure. + * @pcct_entry: Pointer to the ACPI subtable header. * * Return: 0 for Success, else errno. * - * This gets called for each entry in the PCC table. + * There should be one entry per PCC channel. This gets called for each + * entry in the PCC table. This uses PCCY Type1 structure for all applicable + * types(Type 1 -4) to fetch irq */ -static int pcc_parse_subspace_irq(int id, struct acpi_pcct_hw_reduced *pcct_ss) +static int pcc_parse_subspace_irq(struct pcc_chan_info *pchan, + struct acpi_subtable_header *pcct_entry) { - struct pcc_chan_info *pchan = chan_info + id; + struct acpi_pcct_hw_reduced *pcct_ss; + if (pcct_entry->type < ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE || + pcct_entry->type > ACPI_PCCT_TYPE_EXT_PCC_SLAVE_SUBSPACE) + return 0; + + pcct_ss = (struct acpi_pcct_hw_reduced *)pcct_entry; pchan->db_irq = pcc_map_interrupt(pcct_ss->platform_interrupt, (u32)pcct_ss->flags); if (pchan->db_irq <= 0) { @@ -424,8 +432,7 @@ static int pcc_parse_subspace_irq(int id, struct acpi_pcct_hw_reduced *pcct_ss) return -EINVAL; } - if (pcct_ss->header.type - == ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE_TYPE2) { + if (pcct_ss->header.type == ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE_TYPE2) { struct acpi_pcct_hw_reduced_type2 *pcct2_ss = (void *)pcct_ss; pchan->db_ack_vaddr = @@ -509,17 +516,10 @@ static int __init acpi_pcc_probe(void) struct acpi_pcct_subspace *pcct_ss; pcc_mbox_channels[i].con_priv = pcct_entry; - if (pcct_entry->type == ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE || - pcct_entry->type == ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE_TYPE2) { - struct acpi_pcct_hw_reduced *pcct_hrss; - - pcct_hrss = (struct acpi_pcct_hw_reduced *) pcct_entry; - - if (pcc_mbox_ctrl.txdone_irq) { - rc = pcc_parse_subspace_irq(i, pcct_hrss); - if (rc < 0) - goto err; - } + if (pcc_mbox_ctrl.txdone_irq) { + rc = pcc_parse_subspace_irq(pchan, pcct_entry); + if (rc < 0) + goto err; } pcct_ss = (struct acpi_pcct_subspace *) pcct_entry;