From patchwork Thu Mar 13 15:28:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 14015283 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B811F267F4F; Thu, 13 Mar 2025 15:29:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879756; cv=none; b=hbILuYgE/+W9jCDCufVGb3GblSX3MJJWP/Ki+MOLH3ACe9Jk3zb72xeIQd/VeJKYTo9YNtLOz/TJq1d8/LsrV9jp0ciFHjGzQllxav544NB14nKNkGFA1IRlXngFYptI5JO8UyW5hsZlicq/4eCfuRM71o0x6VyENaftnaCm24g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879756; c=relaxed/simple; bh=NQbyptRwAeP3RHevwuUTs6vCxAkaqegjdsMRF6siQF4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lRCe9D6jbNGdLuAQuHk3sMzGlaEr5LZsyDpXg4/Nk8DP/PdrGux0g54ptvWaXxrhW4dRp/Vf5eNsLk8giN6VGdBAYBs+goLgFGhReUxZ11S48t4Vj4YRFYjlO546RbQD8GAR8VZtsWVsegEWT/HGiTJrhEngwVY+6574gt3vGeg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 4AC271516; Thu, 13 Mar 2025 08:29:23 -0700 (PDT) Received: from e133711.arm.com (e133711.arm.com [10.1.196.55]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C94933F694; Thu, 13 Mar 2025 08:29:11 -0700 (PDT) From: Sudeep Holla Date: Thu, 13 Mar 2025 15:28:47 +0000 Subject: [PATCH v3 01/13] mailbox: pcc: Fix the possible race in updation of chan_in_use flag Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-pcc_fixes_updates-v3-1-019a4aa74d0f@arm.com> References: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> In-Reply-To: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sudeep Holla , Jassi Brar , Huisong Li , Adam Young , Robbie King X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3240; i=sudeep.holla@arm.com; h=from:subject:message-id; bh=dxK+XKYYiFPaimo8uMWpmsf+NJk31atPdAwkPEBgDVs=; b=owEBbQKS/ZANAwAIAQBBurwxfuKYAcsmYgBn0vnDRyhuZxpA6nNUZalpyyOa820Eh0x8ALXzJ mKyysNuSHSJAjMEAAEIAB0WIQS6ceUSBvMeskPdk+EAQbq8MX7imAUCZ9L5wwAKCRAAQbq8MX7i mO6/EACeOvjYrH8qLAi4BZJSChAtzS4xIC4AXnqsVPKQvn3qUgURiSsnwbZzkOFjDgFNcEvTP/6 SYxWQDT3hcdyzPE4lznS8yKCvRomC4FJ7CjHuRf1KrqQ00LgVBMCBcRMEk8RxuVZK5z0jWFiLW8 Clnpka5WCG32x0Amlpd99A6kjnma4pxPLl+mJ7FMvhF6Kn1hDk2xQkvPXogLBr7bnquJNw9dVX1 4vAnjEPzUiiQur6nAPeibz5FNWDDW1aO3p9s1J5fDDHdcHdywfaVwHF66NORu8b0StijVqVRdQP iVmrXi8duvDzdVss7w7eiL18TXpC3Zkw8fVC6Z666v+tiDT4sKGgLjQM6jyEv8q5XvnDmyjwD8M OcuS1zpQP8GMda6nCgmbZBjmkK/WeyHHj2x57sj4/Io+Elsd/UNc3Ft9pWWzaoM+rG6mriqPw3L 15xSajaRMYzPj1qyq/lyZc05RgK6idonM7y8Vgf/QD+VyvffxVC948FohTRApel5OI+UX9luL/F W5QXhVE3vFU/NV1FcoO76FlX1V4csSlu3QJuA7Q5ag/K6TwdRRuU2GLzfR72aW760M3E1Mm6TYN ngKjhMJYa7R+v3XnjDAvuY5+IwVoyWeyDHnFaHbBOUW6G4pG+0XEqz/cBCb9O6utDTFy5dgZpbK qxNa+WvkuLAM78A== X-Developer-Key: i=sudeep.holla@arm.com; a=openpgp; fpr=7360A21742ADF5A11767C1C139CFD4755FE2D5B4 From: Huisong Li The function mbox_chan_received_data() calls the Rx callback of the mailbox client driver. The callback might set chan_in_use flag from pcc_send_data(). This flag's status determines whether the PCC channel is in use. However, there is a potential race condition where chan_in_use is updated incorrectly due to concurrency between the interrupt handler (pcc_mbox_irq()) and the command sender(pcc_send_data()). The 'chan_in_use' flag of a channel is set to true after sending a command. And the flag of the new command may be cleared erroneous by the interrupt handler afer mbox_chan_received_data() returns, As a result, the interrupt being level triggered can't be cleared in pcc_mbox_irq() and it will be disabled after the number of handled times exceeds the specified value. The error log is as follows: | kunpeng_hccs HISI04B2:00: PCC command executed timeout! | kunpeng_hccs HISI04B2:00: get port link status info failed, ret = -110 | irq 13: nobody cared (try booting with the "irqpoll" option) | Call trace: | dump_backtrace+0x0/0x210 | show_stack+0x1c/0x2c | dump_stack+0xec/0x130 | __report_bad_irq+0x50/0x190 | note_interrupt+0x1e4/0x260 | handle_irq_event+0x144/0x17c | handle_fasteoi_irq+0xd0/0x240 | __handle_domain_irq+0x80/0xf0 | gic_handle_irq+0x74/0x2d0 | el1_irq+0xbc/0x140 | mnt_clone_write+0x0/0x70 | file_update_time+0xcc/0x160 | fault_dirty_shared_page+0xe8/0x150 | do_shared_fault+0x80/0x1d0 | do_fault+0x118/0x1a4 | handle_pte_fault+0x154/0x230 | __handle_mm_fault+0x1ac/0x390 | handle_mm_fault+0xf0/0x250 | do_page_fault+0x184/0x454 | do_translation_fault+0xac/0xd4 | do_mem_abort+0x44/0xb4 | el0_da+0x40/0x74 | el0_sync_handler+0x60/0xb4 | el0_sync+0x168/0x180 | handlers: | pcc_mbox_irq | Disabling IRQ #13 To solve this issue, pcc_mbox_irq() must clear 'chan_in_use' flag before the call to mbox_chan_received_data(). Tested-by: Adam Young Tested-by: Robbie King Signed-off-by: Huisong Li (sudeep.holla: Minor updates to the subject, commit message and comment) Signed-off-by: Sudeep Holla --- drivers/mailbox/pcc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c index 82102a4c5d68839170238540a6fed61afa5185a0..8fd4d0f79b090eeea1c7779061841ef507083687 100644 --- a/drivers/mailbox/pcc.c +++ b/drivers/mailbox/pcc.c @@ -333,10 +333,16 @@ static irqreturn_t pcc_mbox_irq(int irq, void *p) if (pcc_chan_reg_read_modify_write(&pchan->plat_irq_ack)) return IRQ_NONE; + /* + * Clear this flag after updating interrupt ack register and just + * before mbox_chan_received_data() which might call pcc_send_data() + * where the flag is set again to start new transfer. This is + * required to avoid any possible race in updatation of this flag. + */ + pchan->chan_in_use = false; mbox_chan_received_data(chan, NULL); check_and_ack(pchan, chan); - pchan->chan_in_use = false; return IRQ_HANDLED; } From patchwork Thu Mar 13 15:28:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 14015285 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C2DF5269809; Thu, 13 Mar 2025 15:29:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879759; cv=none; b=CYf/yFKdtflskTI0rBjQxznsyjLYRbhXkTMcQuM2CZ7toDNSA/Xyzgk+IrGQhhfOsY4b/IqyYRufnMAEHaGI1WmNrBD3ZkKgM31WhhHQrt+V8uEnrhBLzvQsDI4NFI+NKELXkqB3HzdCJjhqoOroegH/bTO9/6Z4yJIJGJqhh34= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879759; c=relaxed/simple; bh=2xOSO0qI0Yp+T224QwvCJECRbLvlQqE6m009JdNfF2E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=l8wQdqe4v5RR3ga+EeGygb5K0kfaoMC5mBfRtGATfrHPNrs4BpRSKcfUEIrd9zCNFtklqYe13NETLpV8ou8/kavqGmMvSsE//urvGOsqX1VFXkQCjSPd2rbFfjzT6rWxFUZNxW3aVP0IhaLmUs1wCa0HUToZF4D0KG7BTKhp+3g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 BDBF31F91; Thu, 13 Mar 2025 08:29:24 -0700 (PDT) Received: from e133711.arm.com (e133711.arm.com [10.1.196.55]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 47D4B3F694; Thu, 13 Mar 2025 08:29:13 -0700 (PDT) From: Sudeep Holla Date: Thu, 13 Mar 2025 15:28:48 +0000 Subject: [PATCH v3 02/13] mailbox: pcc: Always clear the platform ack interrupt first Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-pcc_fixes_updates-v3-2-019a4aa74d0f@arm.com> References: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> In-Reply-To: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sudeep Holla , Jassi Brar , Huisong Li , Adam Young , Robbie King X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4871; i=sudeep.holla@arm.com; h=from:subject:message-id; bh=2xOSO0qI0Yp+T224QwvCJECRbLvlQqE6m009JdNfF2E=; b=owEBbQKS/ZANAwAIAQBBurwxfuKYAcsmYgBn0vnD5RryRhdOXd85+3gPEr7EtIgt+ZT6GkopZ Jd8m13K8qCJAjMEAAEIAB0WIQS6ceUSBvMeskPdk+EAQbq8MX7imAUCZ9L5wwAKCRAAQbq8MX7i mPtQD/4geIdurw9ljohM8myDtjvlcPJl1eHut67vvjS0nje/q7eZethsbWiYK0PiPgmT432b2in hgBJfPIEP/2y257zgjHaivgcdPK6vOaqLkp5hYqS9DzBZhqGinDZdJQWQfvYMSamPCWGBDfXe+F 4pE4RzMfiRgK9lH6xZEDRJz+nMi9fhsshBggd92TUsmbF5EjmpJTtHlh5ML9oqXkT852/V6P5Py 98qvFrztCb07t3HzYKljV12bANSo4g+2AmKfKPjQos0OwT5xfoODteeUNi4HdcuMbyuCJmRdfxT qTgNTISLmNlJpThIj9UVe4iCalYhU15tnMfORa1Hb0cAxtDNRNYCmKTSMRUvhSImEynHu+NKCkC jiWi0a9JTtl7B35X7ZL1YFyxS+gU8vjAXg8f3iGHzhFkXuFxh26H3EoB1il/4AZO2+TYhVXlcbS YI21YyzxSjiapTNt9/PwW0KBNg4bOUV2IGAm/JDVWWWTbdWNxuaVNiQpzN0csw2jdpZ4tYkvq2f X1PKmIpTBBZ3h0X10Cs69uRWSS8cBGAbnmiHLmpW1+GY7BkAMubOil3JbtcbjRPmZgJKh33Jna5 UuAC1a+BmceqYZr+yQvKC2nm33lKoKb4/2Ec9GZQhjF7hiAefu2qpQBKBckQWjCCcB/RyKnJsnC Wdu5sJiJaTYd6Yg== X-Developer-Key: i=sudeep.holla@arm.com; a=openpgp; fpr=7360A21742ADF5A11767C1C139CFD4755FE2D5B4 The PCC mailbox interrupt handler (pcc_mbox_irq()) currently checks for command completion flags and any error status before clearing the interrupt. The below sequence highlights an issue in the handling of PCC mailbox interrupts, specifically when dealing with doorbell notifications and acknowledgment between the OSPM and the platform where type3 and type4 channels are sharing the interrupt. ------------------------------------------------------------------------- | T | Platform Firmware | OSPM/Linux PCC driver | |---|---------------------------------|---------------------------------| | 1 | | Build message in shmem | | 2 | | Ring Type3 chan doorbell | | 3 | Receives the doorbell interrupt | | | 4 | Process the message from OSPM | | | 5 | Build response for the message | | | 6 | Ring Platform ACK interrupt on | | | | Type3 chan to OSPM | Received the interrupt | | 7 | Build Notification in Type4 Chan| | | 8 | | Start processing interrupt in | | | | pcc_mbox_irq() handler | | 9 | | Enter PCC handler for Type4 chan| |10 | | Check command complete cleared | |11 | | Read the notification | |12 | | Clear Platform ACK interrupt | | | No effect from the previous step yet as the Platform ACK | | | interrupt has not yet been triggered for this channel | |13 | Ring Platform ACK interrupt on | | | | Type4 chan to OSPM | | |14 | | Enter PCC handler for Type3 chan| |15 | | Command complete is set. | |16 | | Read the response. | |17 | | Clear Platform ACK interrupt | |18 | | Leave PCC handler for Type3 | |19 | | Leave pcc_mbox_irq() handler | |20 | | Re-enter pcc_mbox_irq() handler | |21 | | Enter PCC handler for Type4 chan| |22 | | Leave PCC handler for Type4 chan| |23 | | Enter PCC handler for Type3 chan| |24 | | Leave PCC handler for Type3 chan| |25 | | Leave pcc_mbox_irq() handler | ------------------------------------------------------------------------- The key issue occurs when OSPM tries to acknowledge platform ack interrupt for a notification which is ready to be read and processed but the interrupt itself is not yet triggered by the platform. This ineffective acknowledgment leads to an issue later in time where the interrupt remains pending as we exit the interrupt handler without clearing the platform ack interrupt as there is no pending response or notification. The interrupt acknowledgment order is incorrect. To resolve this issue, the platform acknowledgment interrupt should always be cleared before processing the interrupt for any notifications or response. Reported-by: Robbie King Reviewed-by: Huisong Li Tested-by: Huisong Li Tested-by: Adam Young Tested-by: Robbie King Signed-off-by: Sudeep Holla --- drivers/mailbox/pcc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c index 8fd4d0f79b090eeea1c7779061841ef507083687..f8215a8f656a460b38806d4c002470c3fe1e3c9c 100644 --- a/drivers/mailbox/pcc.c +++ b/drivers/mailbox/pcc.c @@ -313,6 +313,10 @@ static irqreturn_t pcc_mbox_irq(int irq, void *p) int ret; pchan = chan->con_priv; + + if (pcc_chan_reg_read_modify_write(&pchan->plat_irq_ack)) + return IRQ_NONE; + if (pchan->type == ACPI_PCCT_TYPE_EXT_PCC_MASTER_SUBSPACE && !pchan->chan_in_use) return IRQ_NONE; @@ -330,9 +334,6 @@ static irqreturn_t pcc_mbox_irq(int irq, void *p) return IRQ_NONE; } - if (pcc_chan_reg_read_modify_write(&pchan->plat_irq_ack)) - return IRQ_NONE; - /* * Clear this flag after updating interrupt ack register and just * before mbox_chan_received_data() which might call pcc_send_data() From patchwork Thu Mar 13 15:28:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 14015284 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C2D8E269808; Thu, 13 Mar 2025 15:29:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879759; cv=none; b=Qi7mzKfLl9kVpHtBlXJXK4QewWAGGFQY7aqm1NuU+r9xeUpURKCXwUqZ8MVpLTW3b71nRuXnMApq59nZtni50/QVZhfKsektclVv2AaBHBIcEQ2af2sC3GQkbvA+K7sAYTFmR/yyxx33TvyrIv/yOt5s+t4m6U1QAe4AwlTu/6I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879759; c=relaxed/simple; bh=UCfoq5iv8gZQgWR9g+UiHw55YgFlpcDqEVY1HoIkIzs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eTbV4gPFcINTshxFpZAt1+av3Gk0XGIeYYbqIcErG94ZbWfO8Xzf8DUzeuCnpCYvADIVzIHaE/0NM0Gi2kc3Z10YcHg+Wm6/2GP5jkdmNqtktY1wTXeiaNPNXwB6y5IwpfAZJRl5CPa2e5Ca0vx2888kzU17PAFqryvFT56vCbc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 3C29E201B; Thu, 13 Mar 2025 08:29:26 -0700 (PDT) Received: from e133711.arm.com (e133711.arm.com [10.1.196.55]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BAC1F3F694; Thu, 13 Mar 2025 08:29:14 -0700 (PDT) From: Sudeep Holla Date: Thu, 13 Mar 2025 15:28:49 +0000 Subject: [PATCH v3 03/13] mailbox: pcc: Drop unnecessary endianness conversion of pcc_hdr.flags Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-pcc_fixes_updates-v3-3-019a4aa74d0f@arm.com> References: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> In-Reply-To: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sudeep Holla , Jassi Brar , Huisong Li , Adam Young , Robbie King X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2141; i=sudeep.holla@arm.com; h=from:subject:message-id; bh=UCfoq5iv8gZQgWR9g+UiHw55YgFlpcDqEVY1HoIkIzs=; b=owEBbQKS/ZANAwAIAQBBurwxfuKYAcsmYgBn0vnESUxQx6rqi4Q0YSvDGMvX2KJJ+P4dmoQm4 knxotCnrqOJAjMEAAEIAB0WIQS6ceUSBvMeskPdk+EAQbq8MX7imAUCZ9L5xAAKCRAAQbq8MX7i mFcNEACxVrjtPjXpBrEX4HVnmPkyaozacS2YdnDAtATsCmJJH2+5LDQNqHnMecgrqJEANJwRme0 hLu1ZsDgYlr/KJWA2Y/sG76wuOesNLtAFdj+5lVgtHjed0VlNlcSP0utcVQFKVyB/svHm8E4FXV lf8xoD72n9kgSiGXOupWk0dH/MvcX5l2DXMCz8WiUbpuljps5T7OPmxWDGZS9Oqgq77KL418COI TIZNwZ+DU+8vAYpGRPi1wR2vwc1ZFpRaxBtwaW8zojjOwtXs5qLpGcX6IE2NFDOwdxvem44+ask R17UOwRmP56W/S/8T1fG8se/XdkYr7AyZkUKFbuJBs4nghj+dANbAmhUsimWp/3cHIr2duqwzK9 FFHYrt9peo82QB4+g4wSflJ7QZbX/lFB5F1FzJXN3BSA6i5/1OF9pxCLK0wXOAJrhqu0datP06+ WUQe2JVMGHZ4Sd1Vd6RnHyQ/LDKuBlwCaBw98Op53Ai1xovRz1hjYrnzKzpJLb8lEfH4v1hiOEj +dUE2atz0HcH8+w1PmEQ8OxB+j/HUwzwO4tw3o2Pjo/QxiA+GB/HoNLy2Epq/DChudtsN6YdfGU B6H1yvDq1fIPJyycStOuGZQs0f/IammcpqIbzMLXh6LJ9knE0c4bzpYRhUNtiHvfAOm1ZvrMnnk eMgt3Deld7vGQKA== X-Developer-Key: i=sudeep.holla@arm.com; a=openpgp; fpr=7360A21742ADF5A11767C1C139CFD4755FE2D5B4 The Sparse static checker flags a type mismatch warning related to endianness conversion: | warning: incorrect type in argument 1 (different base types) | expected restricted __le32 const [usertype] *p | got unsigned int * This is because an explicit endianness conversion (le32_to_cpu()) was applied unnecessarily to a pcc_hdr.flags field that is already in little-endian format. The PCC driver is only enabled on little-endian kernels due to its dependency on ACPI and EFI, making the explicit conversion unnecessary. The redundant conversion occurs in pcc_chan_check_and_ack() for the pcc_hdr.flags field. Drop this unnecessary endianness conversion of pcc_hdr.flags. Also drop the redundant PCC_ACK_FLAG_MASK definition and use the more appropriate and already defined PCC_CMD_COMPLETION_NOTIFY. Acked-by: Huisong Li Tested-by: Adam Young Signed-off-by: Sudeep Holla --- drivers/mailbox/pcc.c | 2 +- include/acpi/pcc.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c index f8215a8f656a460b38806d4c002470c3fe1e3c9c..9cf0ca772c1adb73ceb91d25a2abd1d12c678d90 100644 --- a/drivers/mailbox/pcc.c +++ b/drivers/mailbox/pcc.c @@ -292,7 +292,7 @@ static void check_and_ack(struct pcc_chan_info *pchan, struct mbox_chan *chan) * * The PCC master subspace channel clears chan_in_use to free channel. */ - if (le32_to_cpup(&pcc_hdr.flags) & PCC_ACK_FLAG_MASK) + if (pcc_hdr.flags & PCC_CMD_COMPLETION_NOTIFY) pcc_send_data(chan, NULL); else pcc_chan_reg_read_modify_write(&pchan->cmd_update); diff --git a/include/acpi/pcc.h b/include/acpi/pcc.h index 699c1a37b8e7846362bae35477eb5736be15d79e..d1e506f041c5a80857d4a025fa3c1803746ba4b9 100644 --- a/include/acpi/pcc.h +++ b/include/acpi/pcc.h @@ -32,7 +32,6 @@ struct pcc_mbox_chan { #define PCC_CMD_COMPLETION_NOTIFY BIT(0) #define MAX_PCC_SUBSPACES 256 -#define PCC_ACK_FLAG_MASK 0x1 #ifdef CONFIG_PCC extern struct pcc_mbox_chan * From patchwork Thu Mar 13 15:28:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 14015286 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3BB0C267F4F; Thu, 13 Mar 2025 15:29:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879759; cv=none; b=b9oUlH7RtMqXt7zMc79PKvaRaMzTVwJcd4zrCKhwLxNqNH5iPwIGwwUw/hqi2mNHlRf76swnllHfHafUL7+NB/prCTjYeZet4FkFQWjyWC9WFJCvO46NJ76WcwyhSLEL2hTUl5noWfZ4tH1ZxLJGoMKN5y8VyMA+O9MTZxGhukg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879759; c=relaxed/simple; bh=3ZwsMl0pgl+y8ZnbR+YoOttJ0rCuNXNsiO6IGFcuJRU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pgePFMUG7+K5mpKLu8x44177IEK/E/VTqMrjosPJM5OJ1iQuLIeLgwYvLRkhApX33LonOV2XlUgcggJnMk3hmRF/NT7va1mM5qMYIFMBU4H+5RIIboaCJJY87ZPM/oSd1o8HDaaxz3eksrWbF9WrfirQX1+j6h6HUjNq1H4C3/o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 AED7B1516; Thu, 13 Mar 2025 08:29:27 -0700 (PDT) Received: from e133711.arm.com (e133711.arm.com [10.1.196.55]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 394F23F694; Thu, 13 Mar 2025 08:29:16 -0700 (PDT) From: Sudeep Holla Date: Thu, 13 Mar 2025 15:28:50 +0000 Subject: [PATCH v3 04/13] mailbox: pcc: Return early if no GAS register from pcc_mbox_cmd_complete_check Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-pcc_fixes_updates-v3-4-019a4aa74d0f@arm.com> References: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> In-Reply-To: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sudeep Holla , Jassi Brar , Huisong Li , Adam Young , Robbie King X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1241; i=sudeep.holla@arm.com; h=from:subject:message-id; bh=3ZwsMl0pgl+y8ZnbR+YoOttJ0rCuNXNsiO6IGFcuJRU=; b=owEBbQKS/ZANAwAIAQBBurwxfuKYAcsmYgBn0vnEmDNJPNaozKa092u5uXkRHi5LaWrlvYKW2 4BLdaHznrKJAjMEAAEIAB0WIQS6ceUSBvMeskPdk+EAQbq8MX7imAUCZ9L5xAAKCRAAQbq8MX7i mHZYD/oDNIiIkLk5rhaoMs5PbiGy0XpVThEY1aTHsOlyOR6TrB7nBf8qjIvRi+SxtYzd41EzxKr 2Psx7fAjPsOhMBfFgXPWCeC9PE/sZdVDJP1YgOJz+Jbj6DjySb0N5YlmFJX0mDibxUUVbFE/iq0 sMz4EC1KFHq3j9MetkP4/aX0NDyPKeleFIPCb5e8kcPztjv76fiPk7Mh/rBfac58INJlXLiG3n0 cvHZ+J1O+NaM9l5tTc/cLQfWoth7g/mQdjABiFo7jzLPzbsltFcCrI0B6ClAK3VAzLpvUEBPPMN NZlRALtEAJwTYJCRf5Y9qZEGkVYIbbqWZwS0jyvf+dQ551r0RY6h+BgAA5tzTwj3Sy0bOm+VAoR Ii8nG2t9iHI8jPgIrMiQ0gMd1mz8FwbJSl0RNhMNwelIILj6TdSFLuYJMtSLRKq9NJ/sQEeFZxu ovmRDWlVqPxhJY+oxFpPWMgRCacwzmWCx0mmie8Hr4YMMy1u7CTeRJV4ZOaVVxNVOBAk7lGwunu VnDQsEZAiaWHPIIqvcJDt5VyWRCkp8z859waeUy809GmQjQYtxA8sOX+qgepNubB9gbJ6iRvBrQ 4O1hhz2nVuJ3J0DFgJ+HPNl9IZMjfugwu4fzBvkQM+TimIl6i35EvcUiF+S4sdnckpzNfcSqwi2 PyNmD0AD/in7SiA== X-Developer-Key: i=sudeep.holla@arm.com; a=openpgp; fpr=7360A21742ADF5A11767C1C139CFD4755FE2D5B4 pcc_mbox_cmd_complete_check() accesses pchan->cmd_complete.gas to check command completion status. Even if GAS is NULL, pcc_chan_reg_read() gets called which returns success doing nothing and then we return. Add an early return if pchan->cmd_complete.gas == NULL before performing any operations. Acked-by: Huisong Li Tested-by: Huisong Li Tested-by: Adam Young Signed-off-by: Sudeep Holla --- drivers/mailbox/pcc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c index 9cf0ca772c1adb73ceb91d25a2abd1d12c678d90..7105dd6bc2fc6b8d36cb62f7ecd1b578361f89b6 100644 --- a/drivers/mailbox/pcc.c +++ b/drivers/mailbox/pcc.c @@ -245,13 +245,13 @@ static bool pcc_mbox_cmd_complete_check(struct pcc_chan_info *pchan) u64 val; int ret; + if (!pchan->cmd_complete.gas) + return true; + ret = pcc_chan_reg_read(&pchan->cmd_complete, &val); if (ret) return false; - if (!pchan->cmd_complete.gas) - return true; - /* * Judge if the channel respond the interrupt based on the value of * command complete. From patchwork Thu Mar 13 15:28:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 14015287 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 80366269816; Thu, 13 Mar 2025 15:29:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879761; cv=none; b=DeiSC1TchKpQkNZsYpCjQ2JlXGH/h/lPhTM16jc/omB1D1WblZGSkV3znmh3wH9roBimHZsSbt0bPGm4LzcHYNey2doFqwgky3FgediGvYYs0V0GTrBsLdpg5F0jb1oeigaSI3jq4O4nE1peC+08miEF5/Xx2dLGPUohPW5FGKo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879761; c=relaxed/simple; bh=VPUGFmtI1iuXgQ1aLwLZD3h5ALRy8oTBEohdtSGq27w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UPpgmzEKIWDdmDmG99kBK2MVUFuYCMC+VY3mHKnneUDXJPp6LjoDeQZIzch65u0eR+wimS4SQA4ZOXkWIQJCDTPSDQA3wPrLqLN/QHkjOEBgBNMownkP2Xzvtc9ZT/o4ZrFPOcJ7+0E1nSCVRW7AGFTdOhnV4GBWO7BuYm+CRkU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 34F2728C7; Thu, 13 Mar 2025 08:29:29 -0700 (PDT) Received: from e133711.arm.com (e133711.arm.com [10.1.196.55]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id AC0113F694; Thu, 13 Mar 2025 08:29:17 -0700 (PDT) From: Sudeep Holla Date: Thu, 13 Mar 2025 15:28:51 +0000 Subject: [PATCH v3 05/13] mailbox: pcc: Use acpi_os_ioremap() instead of ioremap() Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-pcc_fixes_updates-v3-5-019a4aa74d0f@arm.com> References: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> In-Reply-To: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sudeep Holla , Jassi Brar , Huisong Li , Adam Young , Robbie King X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1423; i=sudeep.holla@arm.com; h=from:subject:message-id; bh=VPUGFmtI1iuXgQ1aLwLZD3h5ALRy8oTBEohdtSGq27w=; b=owEBbQKS/ZANAwAIAQBBurwxfuKYAcsmYgBn0vnE/gW7t89bPt+5P7OubJum2RN+xBVtn0084 +vQJXkWqquJAjMEAAEIAB0WIQS6ceUSBvMeskPdk+EAQbq8MX7imAUCZ9L5xAAKCRAAQbq8MX7i mHrUEACE/ZPAxlV6/kkgqOfvdAFCaHif65+JA3vHEm0Ax0Td9qXsDubDCTNnA2TzjTnTvjGhZcB 9Y7s9kxXkdyxXhuLytF8IAdzbZWmL4bRHETzKSFWPa3POC7tNPOtxUz2Jyr0OaMHUe1VdnmEeWt rIwOQP0ScEyzSY7v5VRHv88QSt25/hDbkvQAxPg1Otj2u3ZVneps3qhFgaYqzitsIlLBZWdbXzL e2Q1Z8dNAf2nT9pAjpThsmP30sgsRoLRImROnHor0pCxisIrieguyjB2yWRG4FYFW40cbHxknEA Wute2eTu6lfV8XCU9xjRP5PowuZ1V/vAn7RiiQVOlWLUjG4KwivdugZt+aF8E9rgcFWjOKfreqL ea64SL29i+GPQnnCDlCnd5aQdTTt0qdwoOwjeaE1BoUJAmRBDQIxl83e5n1qBPUWILJfwXHj8jb VHoKfoi/crqPekcPmN2ILRwDpy9SIa43+qLO0Q8FWnVzhVfZIEdcp+rAHFhb3FEPSchGbST0pXm bhRSRf16LDhH8SMHPaBOaguDvUD2Y6cApVkdwGcyaUJcFFZ0+1w216LZOZVdDmvoMKfU0tFni6q jh/GsFziPJZB6H1k9knNjN1axVAo/avdKpAOqSLkMRAX49SYw48S8sWTaYKswWahHpn/IoVtQGR rKG6Z0FAmaNay2A== X-Developer-Key: i=sudeep.holla@arm.com; a=openpgp; fpr=7360A21742ADF5A11767C1C139CFD4755FE2D5B4 The Platform Communication Channel (PCC) mailbox driver currently uses ioremap() to map channel shared memory regions. However it is preferred to use acpi_os_ioremap(), which is mapping function specific to EFI/ACPI defined memory regions. It ensures that the correct memory attributes are applied when mapping ACPI-provided regions. While at it, also add checks for handling any errors with the mapping. Acked-by: Huisong Li Tested-by: Huisong Li Tested-by: Adam Young Signed-off-by: Sudeep Holla --- drivers/mailbox/pcc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c index 7105dd6bc2fc6b8d36cb62f7ecd1b578361f89b6..fcbf19d7472d05f3c39389d292e6c6646e4b6b24 100644 --- a/drivers/mailbox/pcc.c +++ b/drivers/mailbox/pcc.c @@ -419,8 +419,12 @@ int pcc_mbox_ioremap(struct mbox_chan *chan) return -1; pchan_info = chan->con_priv; pcc_mbox_chan = &pchan_info->chan; - pcc_mbox_chan->shmem = ioremap(pcc_mbox_chan->shmem_base_addr, - pcc_mbox_chan->shmem_size); + + pcc_mbox_chan->shmem = acpi_os_ioremap(pcc_mbox_chan->shmem_base_addr, + pcc_mbox_chan->shmem_size); + if (!pcc_mbox_chan->shmem) + return -ENXIO; + return 0; } EXPORT_SYMBOL_GPL(pcc_mbox_ioremap); From patchwork Thu Mar 13 15:28:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 14015288 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8617C269895; Thu, 13 Mar 2025 15:29:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879762; cv=none; b=ih7fesSN0faSK9yZy1WrSEferWadisrnmtHBO1yEu7V1bawGw9RwKcv/c3OEp8bqcFGHe6qh281E7A0kogpmjwYn39TwSUIHbaBvLiFov6G/PQ0QZL1pxwNCmXY/G0vCgS0a4Kc04NtEOwBFQ4efnn3bq0otpovbyifvdb9mUuw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879762; c=relaxed/simple; bh=fuYkPulF6TGzFJB0T+8ug8u78/9jsDIvjelffcznDHQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HC+gCgxKRHMtrPEAayImZlcyGq2ZUzZXbfPhFj+b3y8HQgZ405ff06AywgjmtQd8K8sV/rcGBLcDGyRvxUFa8fss+VJ6wY+CNo8p2PNslWRJQIXAtlWR2+R424OmO0iO5K9DX0xkVudXYBjK8JB+V0r/Tq34l0d3BxG8pbGjBR4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 9FF791516; Thu, 13 Mar 2025 08:29:30 -0700 (PDT) Received: from e133711.arm.com (e133711.arm.com [10.1.196.55]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2A7073F694; Thu, 13 Mar 2025 08:29:19 -0700 (PDT) From: Sudeep Holla Date: Thu, 13 Mar 2025 15:28:52 +0000 Subject: [PATCH v3 06/13] mailbox: pcc: Refactor error handling in irq handler into separate function Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-pcc_fixes_updates-v3-6-019a4aa74d0f@arm.com> References: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> In-Reply-To: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sudeep Holla , Jassi Brar , Huisong Li , Adam Young , Robbie King X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2411; i=sudeep.holla@arm.com; h=from:subject:message-id; bh=fuYkPulF6TGzFJB0T+8ug8u78/9jsDIvjelffcznDHQ=; b=owEBbQKS/ZANAwAIAQBBurwxfuKYAcsmYgBn0vnECxx5+KRKPF2aIc0kHIOiDCPBqrtcU53rb Li4K1sPAWuJAjMEAAEIAB0WIQS6ceUSBvMeskPdk+EAQbq8MX7imAUCZ9L5xAAKCRAAQbq8MX7i mEJID/99/s5+lKyz42AY7C3m+Ttfzq98W+5o1sDpBc3nbj0dZefZev7shLZKR8/gylzQ19Zfxs0 FqVz7m6kvuLB4eB/LkEfwIp0fTzJn4oRQ9GftyNnera0FiKZFc/EnLIT+BIvxc03b6MNnliS0Ga B6AXzoC+8UPGMRqfp8JUf0bc0atEBGP7j3usLWbNnrG6AZE3HMm10YybJ35yb0k/XrWhIHhCsmc 5+ElHcCyXdnHv9p0IM5HMMMppQFmI0GrlmGznayXGbmG+mzCHzat7GdLkC4P8mG0WQHXEyHA+4x 3ifktvox3laOISgGg2z11JR+kWTYuWt0UaiYLviBTfdr5QhLAyD4TiWAT4Nc/0NxxdjwF9lL8fI NM/4tIT4srvUxhGOBHFy9g1lB87qqum5Ph7PXJNZ9CPfIAFlt9Sl6e8aHa8iEN0hsy5uWI/DgAC qQNFtRmQV+aUu9reIBTjG5OOPWVWd8jCcuiQ2xZZmRYwX64l8PD0H2d8Jsf+9Z8KU+iO9Eag3zG rpsbuvIy52dc5MjxwTiKHIERCKCgVVcol+AP5b8JduhWQWz6+ptDGD9pSyr+KTNg4ZT0RHvhrvg Gh4voBgKHDWAWKsP2/QzIvfRoTF22JuE/ASZ1e2SOXR4e0mUi/sVu89Lj5SkpR2jujqfui2iUoy CvZxfgBQh+V4n7g== X-Developer-Key: i=sudeep.holla@arm.com; a=openpgp; fpr=7360A21742ADF5A11767C1C139CFD4755FE2D5B4 The existing error handling logic in pcc_mbox_irq() is intermixed with the main flow of the function. The command complete check and the complete complete update/acknowledgment are nicely factored into separate functions. Moves error detection and clearing logic into a separate function called: pcc_mbox_error_check_and_clear() by extracting error-handling logic from pcc_mbox_irq(). This ensures error checking and clearing are handled separately and it improves maintainability by keeping the IRQ handler focused on processing events. Acked-by: Huisong Li Tested-by: Huisong Li Tested-by: Adam Young Signed-off-by: Sudeep Holla --- drivers/mailbox/pcc.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c index fcbf19d7472d05f3c39389d292e6c6646e4b6b24..c9e46e2266a46cad2d482c6a15e2737c47275ffb 100644 --- a/drivers/mailbox/pcc.c +++ b/drivers/mailbox/pcc.c @@ -269,6 +269,25 @@ static bool pcc_mbox_cmd_complete_check(struct pcc_chan_info *pchan) return !!val; } +static int pcc_mbox_error_check_and_clear(struct pcc_chan_info *pchan) +{ + u64 val; + int ret; + + ret = pcc_chan_reg_read(&pchan->error, &val); + if (ret) + return ret; + + val &= pchan->error.status_mask; + if (val) { + val &= ~pchan->error.status_mask; + pcc_chan_reg_write(&pchan->error, val); + return -EIO; + } + + return 0; +} + static void check_and_ack(struct pcc_chan_info *pchan, struct mbox_chan *chan) { struct acpi_pcct_ext_pcc_shared_memory pcc_hdr; @@ -309,8 +328,6 @@ static irqreturn_t pcc_mbox_irq(int irq, void *p) { struct pcc_chan_info *pchan; struct mbox_chan *chan = p; - u64 val; - int ret; pchan = chan->con_priv; @@ -324,15 +341,8 @@ static irqreturn_t pcc_mbox_irq(int irq, void *p) if (!pcc_mbox_cmd_complete_check(pchan)) return IRQ_NONE; - ret = pcc_chan_reg_read(&pchan->error, &val); - if (ret) + if (pcc_mbox_error_check_and_clear(pchan)) return IRQ_NONE; - val &= pchan->error.status_mask; - if (val) { - val &= ~pchan->error.status_mask; - pcc_chan_reg_write(&pchan->error, val); - return IRQ_NONE; - } /* * Clear this flag after updating interrupt ack register and just From patchwork Thu Mar 13 15:28:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 14015289 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 00A0C269CE4; Thu, 13 Mar 2025 15:29:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879763; cv=none; b=WhJ8aWgAm5+eMH4KBhBrqZ6x3FqT4VYyVWoUV0n0Ht1WLny6MLOLucbQungCOITLF81uzXDa4BjjnmYJssDYoSvNuuyjlNu9VZrbDdFcrZBCcWYKu5+vCSikeR0BEnmJDivwcH6N0BsLPoMUkk+n/HDmF+Y1urS3kR/GsDB7PKo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879763; c=relaxed/simple; bh=B8EHb3LaVA8gfgQZgvspynE6VO7zbRl64pscQoRy7m0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZpOZsBjfXWpbs8hqPvRE7zGtex0YUTHPxvVrlMq69KstKZglRm1jUWS/TsVk+mD7SjgPqQe82o+USjaC9x7p+Zn+r8v6Ir4Cl+puPlSvX0AfIK7KYoKgCT9xvfPMqhGZfZdNPyKFS01YQT3HhPueVCQwxht8nd1LoCkvdLKZuD0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 1E40A1F91; Thu, 13 Mar 2025 08:29:32 -0700 (PDT) Received: from e133711.arm.com (e133711.arm.com [10.1.196.55]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9CEF83F694; Thu, 13 Mar 2025 08:29:20 -0700 (PDT) From: Sudeep Holla Date: Thu, 13 Mar 2025 15:28:53 +0000 Subject: [PATCH v3 07/13] mailbox: pcc: Always map the shared memory communication address Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-pcc_fixes_updates-v3-7-019a4aa74d0f@arm.com> References: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> In-Reply-To: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sudeep Holla , Jassi Brar , Huisong Li , Adam Young , Robbie King X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3933; i=sudeep.holla@arm.com; h=from:subject:message-id; bh=B8EHb3LaVA8gfgQZgvspynE6VO7zbRl64pscQoRy7m0=; b=owEBbQKS/ZANAwAIAQBBurwxfuKYAcsmYgBn0vnE36q77T/PggfaIViWENqh1cHyygfb/NozL yvxbEZLoMuJAjMEAAEIAB0WIQS6ceUSBvMeskPdk+EAQbq8MX7imAUCZ9L5xAAKCRAAQbq8MX7i mG9gD/9+NbYExu97OOzyLW0tB1KyrODE0/5oBrEinhMdKNfssELj29NpeISq6FSmLH32Tf6ByVR g1QYvyLRyS5h+q34mubFj7vDvkGxKRF+EzzkXIUKfSytOgrGPNhZCeE0tHLUevc4ICfbFSjdzS9 mWBikdTbQC2aS34iWB5yY/IkmqgNLUIzEoV2FjMSZy+g/BmqvIPMmh5CHKhbJlqP0MPEX5Nfla8 98Kbp19om0lwJrR7VxqXzkSQoXhXPEPvwhyRufwY3+3ooluLgT1lwsT+GQ5Fn8Es8Ln0VTqxf1D EEluBGXMEIxTsvjwG/uYkl3CHM1yNZNxEBj72cwZyfr+T63KYVvratZi2/7WvZDsr3ZrCm2RWlz 9dt4RVdWn8sNUlfr878GBeox0PcWXneOU++AE6Ssdi+EIoSnJTpaJ/StryL9r2IMx4nbh/Um5Tx fv8RgHqKYretyZXi+kwKqhDZd7I1gOGo5LAm2LqV0xSSlntV6KKH8Y+AYiaqKALZ2ZAVDtJxzNP OZsX/XbMY+bWlOT9HAFwgNRe68G7gD9n7YA+Zoo0ac+JKnKRTGYPt8LDUP/dZYRlcUnHS/Zq4Z8 +JZs7CrSfFwAuzu9KmOC5k+ROcnpfRDE/+OtrpSFZjvhpqvIkvQ3Z4/g1Oqv+xb+pQh8F4+Lqcu o2zKI92OoeEx6Yw== X-Developer-Key: i=sudeep.holla@arm.com; a=openpgp; fpr=7360A21742ADF5A11767C1C139CFD4755FE2D5B4 Currently the shared memory communication address was mapped by the mailbox client drivers leading to all sorts of inconsistencies. It also has resulted in the inconsistent attributes used while mapping the shared memory regions. In order to remove/eliminate any issues, let us ensures the shared memory address is always mapped and unmapped when the PCC channels are requested and release. We need to map them as the ACPI PCCT associates these shared memory with each channel subspace and may need use the status or the flags in the headers of those shared memory communication address regions to manage the transport/channel. Note, until all the drivers using PCC start using this mapped shmem, there might be double mapping of the shared memory address. This shouldn't have any impact on existing mbox client drivers. Since there are no users of pcc_chan_ioremap() and also it is mapped by default, we can stop exporting it and merge the functionality into pcc_mbox_request_channel(). Acked-by: Huisong Li Tested-by: Huisong Li Tested-by: Adam Young Signed-off-by: Sudeep Holla --- drivers/mailbox/pcc.c | 29 +++++++++-------------------- include/acpi/pcc.h | 5 ----- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c index c9e46e2266a46cad2d482c6a15e2737c47275ffb..d6671c18750eaa7de92f49d1ec9ad97eedadec1d 100644 --- a/drivers/mailbox/pcc.c +++ b/drivers/mailbox/pcc.c @@ -373,6 +373,7 @@ static irqreturn_t pcc_mbox_irq(int irq, void *p) struct pcc_mbox_chan * pcc_mbox_request_channel(struct mbox_client *cl, int subspace_id) { + struct pcc_mbox_chan *pcc_mchan; struct pcc_chan_info *pchan; struct mbox_chan *chan; int rc; @@ -391,7 +392,14 @@ pcc_mbox_request_channel(struct mbox_client *cl, int subspace_id) if (rc) return ERR_PTR(rc); - return &pchan->chan; + pcc_mchan = &pchan->chan; + pcc_mchan->shmem = acpi_os_ioremap(pcc_mchan->shmem_base_addr, + pcc_mchan->shmem_size); + if (pcc_mchan->shmem) + return pcc_mchan; + + mbox_free_channel(chan); + return ERR_PTR(-ENXIO); } EXPORT_SYMBOL_GPL(pcc_mbox_request_channel); @@ -420,25 +428,6 @@ void pcc_mbox_free_channel(struct pcc_mbox_chan *pchan) } EXPORT_SYMBOL_GPL(pcc_mbox_free_channel); -int pcc_mbox_ioremap(struct mbox_chan *chan) -{ - struct pcc_chan_info *pchan_info; - struct pcc_mbox_chan *pcc_mbox_chan; - - if (!chan || !chan->cl) - return -1; - pchan_info = chan->con_priv; - pcc_mbox_chan = &pchan_info->chan; - - pcc_mbox_chan->shmem = acpi_os_ioremap(pcc_mbox_chan->shmem_base_addr, - pcc_mbox_chan->shmem_size); - if (!pcc_mbox_chan->shmem) - return -ENXIO; - - return 0; -} -EXPORT_SYMBOL_GPL(pcc_mbox_ioremap); - /** * pcc_send_data - Called from Mailbox Controller code. Used * here only to ring the channel doorbell. The PCC client diff --git a/include/acpi/pcc.h b/include/acpi/pcc.h index d1e506f041c5a80857d4a025fa3c1803746ba4b9..840bfc95bae3329605da5f66cf37b7d2ca183f48 100644 --- a/include/acpi/pcc.h +++ b/include/acpi/pcc.h @@ -37,7 +37,6 @@ struct pcc_mbox_chan { extern struct pcc_mbox_chan * pcc_mbox_request_channel(struct mbox_client *cl, int subspace_id); extern void pcc_mbox_free_channel(struct pcc_mbox_chan *chan); -extern int pcc_mbox_ioremap(struct mbox_chan *chan); #else static inline struct pcc_mbox_chan * pcc_mbox_request_channel(struct mbox_client *cl, int subspace_id) @@ -45,10 +44,6 @@ pcc_mbox_request_channel(struct mbox_client *cl, int subspace_id) return ERR_PTR(-ENODEV); } static inline void pcc_mbox_free_channel(struct pcc_mbox_chan *chan) { } -static inline int pcc_mbox_ioremap(struct mbox_chan *chan) -{ - return 0; -}; #endif #endif /* _PCC_H */ From patchwork Thu Mar 13 15:28:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 14015290 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 779D2269D1A; Thu, 13 Mar 2025 15:29:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879765; cv=none; b=a9/b15F4JsmnSbJz8e/ftserR6D9pXLBnfLJ8KdJfCVEP/xzyQNDFi8YlzfunpokSpCX+ED9/gpgMNDRxPFZwHfndl5NiXfs8845UdXEZzXNxwa5m11BIwONR5uB/poubszFhy2ofDgb2uIimgwsdBwLhwDKz53Xv1D7U9JhZx4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879765; c=relaxed/simple; bh=b506LJ/DgSFb4iMltW733r4/qI1uomV1PVxdm2q7lW0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YatbME+JAGUKm0B6PtmGPvk2L1wwE8inRIXA5jnhSsjFQK9KnfRX/c5t/1crr/89tuScJShp3I9TvupCS4JQo/4X87OQzU7nU25WFv0QvuzrYTmL2Z0Jl3CrVKwWqvtE6SoADbxXWVZuQd0IFRvThWy2LoBPsCHPQI2fYCZFlkk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 90D69201B; Thu, 13 Mar 2025 08:29:33 -0700 (PDT) Received: from e133711.arm.com (e133711.arm.com [10.1.196.55]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 1B7153F694; Thu, 13 Mar 2025 08:29:21 -0700 (PDT) From: Sudeep Holla Date: Thu, 13 Mar 2025 15:28:54 +0000 Subject: [PATCH v3 08/13] mailbox: pcc: Refactor and simplify check_and_ack() Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-pcc_fixes_updates-v3-8-019a4aa74d0f@arm.com> References: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> In-Reply-To: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sudeep Holla , Jassi Brar , Huisong Li , Adam Young , Robbie King X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3351; i=sudeep.holla@arm.com; h=from:subject:message-id; bh=b506LJ/DgSFb4iMltW733r4/qI1uomV1PVxdm2q7lW0=; b=owEBbQKS/ZANAwAIAQBBurwxfuKYAcsmYgBn0vnEIPYdszekxa1VG+nNm/5JsA5W8yNYUY2sA m0hIgE9GqqJAjMEAAEIAB0WIQS6ceUSBvMeskPdk+EAQbq8MX7imAUCZ9L5xAAKCRAAQbq8MX7i mFY7D/0S2iqoBwLbuzHGtGhKnDm9Z9IPcJ/bGeAuou9uGuKrw4coWAQy3koA7iREXd5QDK+zhMd ulYV6vDDAJbNdZ6FZIpwLK2PZ7c5FToSez0na1o7xPBJrDLxgwpGVBEie1ZveO4IhwpaVpZfTn0 NDlcaOdaosolW9haWz5EdfQJusJ4GxRFIxh7d6Zh1h3F+y3mmV9rQdR65aML2sGb1qflUJhAtZZ yHqejholy+RHUWVXtQEKf0cJuoZQ8f+C7UBB0k9lGAZa7DxY3ZCLvV2rherUwAMNLlPPYxSnr9V 64HPdsWA9m1gaaGK4xD7usL17VADAl+EFm8MtK70ZGg0gzi7/CDTku1ER98hgs/Z2BHNRwB+vhP p2x8p/W1IZcvO8NfSr3kULCFWiE8f09tZjjeVjmb1yR0zsliPukM0Hsnws/JdnLQue6BrEpEmVl LEoaQcp0eezXIncluwndWuqcd+1ZUfRRY2qVHhgbhQy8qs1SYhuz2zzsdIIPMSoUILnZkiPw7ui 9HZDtFBUZuNiu9lcdek1+DpcJlSIMu5dezd1+fi4n95SJ9UguSsNk4BZ872z3QcwQuLLW1KiBBw OzN0hgrJFwnRklyPk12l2/C2QA9sHN19PpTqrmmD858B/BVnZsVt3UoraZpvAiVOZcT88OykN/H gP0UUgd1t1ofJDQ== X-Developer-Key: i=sudeep.holla@arm.com; a=openpgp; fpr=7360A21742ADF5A11767C1C139CFD4755FE2D5B4 The existing check_and_ack() function had unnecessary complexity. The logic could be streamlined to improve code readability and maintainability. The command update register needs to be updated in order to acknowledge the platform notification through type 4 channel. So it can be done unconditionally. Currently it is complicated just to make use of pcc_send_data() which also executes the same updation. In order to simplify, let us just ring the doorbell directly from check_and_ack() instead of calling into pcc_send_data(). While at it, rename it into pcc_chan_check_and_ack() to maintain consistency in the driver. Acked-by: Huisong Li Tested-by: Adam Young Signed-off-by: Sudeep Holla --- drivers/mailbox/pcc.c | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c index d6671c18750eaa7de92f49d1ec9ad97eedadec1d..f6714c233f5ab740cb43259ca9306ac6e85f5e4b 100644 --- a/drivers/mailbox/pcc.c +++ b/drivers/mailbox/pcc.c @@ -117,8 +117,6 @@ struct pcc_chan_info { static struct pcc_chan_info *chan_info; static int pcc_chan_count; -static int pcc_send_data(struct mbox_chan *chan, void *data); - /* * PCC can be used with perf critical drivers such as CPPC * So it makes sense to locally cache the virtual address and @@ -288,33 +286,24 @@ static int pcc_mbox_error_check_and_clear(struct pcc_chan_info *pchan) return 0; } -static void check_and_ack(struct pcc_chan_info *pchan, struct mbox_chan *chan) +static void pcc_chan_acknowledge(struct pcc_chan_info *pchan) { - struct acpi_pcct_ext_pcc_shared_memory pcc_hdr; + struct acpi_pcct_ext_pcc_shared_memory __iomem *pcc_hdr; if (pchan->type != ACPI_PCCT_TYPE_EXT_PCC_SLAVE_SUBSPACE) return; - /* If the memory region has not been mapped, we cannot - * determine if we need to send the message, but we still - * need to set the cmd_update flag before returning. - */ - if (pchan->chan.shmem == NULL) { - pcc_chan_reg_read_modify_write(&pchan->cmd_update); - return; - } - memcpy_fromio(&pcc_hdr, pchan->chan.shmem, - sizeof(struct acpi_pcct_ext_pcc_shared_memory)); + + pcc_chan_reg_read_modify_write(&pchan->cmd_update); + + pcc_hdr = pchan->chan.shmem; + /* - * The PCC slave subspace channel needs to set the command complete bit - * after processing message. If the PCC_ACK_FLAG is set, it should also - * ring the doorbell. - * - * The PCC master subspace channel clears chan_in_use to free channel. + * The PCC slave subspace channel needs to set the command + * complete bit after processing message. If the PCC_ACK_FLAG + * is set, it should also ring the doorbell. */ - if (pcc_hdr.flags & PCC_CMD_COMPLETION_NOTIFY) - pcc_send_data(chan, NULL); - else - pcc_chan_reg_read_modify_write(&pchan->cmd_update); + if (ioread32(&pcc_hdr->flags) & PCC_CMD_COMPLETION_NOTIFY) + pcc_chan_reg_read_modify_write(&pchan->db); } /** @@ -353,7 +342,7 @@ static irqreturn_t pcc_mbox_irq(int irq, void *p) pchan->chan_in_use = false; mbox_chan_received_data(chan, NULL); - check_and_ack(pchan, chan); + pcc_chan_acknowledge(pchan); return IRQ_HANDLED; } From patchwork Thu Mar 13 15:28:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 14015291 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E043A26A098; Thu, 13 Mar 2025 15:29:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879766; cv=none; b=hE4rAO5QnHHW9KzFpYDumYAtADefoucWaQmVHsUn3o+EHyzwO5vdleCvHZ+U8iCDObzF6iwG466FMIY9HPMNeDawANwqfp6qrYpLzq1Y1WaSNRHX9IjQGXQj3tjXKMwPesSOBjoqgS+k8JJK4QFFofkai7rIru9cxsYYtBHf2kQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879766; c=relaxed/simple; bh=9UGEN/buW+rB+SNY16YtJWZHD/wQwocyB/zk8N1p+qs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ipHFCi4rtMTuY3zCtc3C3fw8BgPDWsOIPxYvP7LAxqac4cw+Nklm74VFWJShZq78qBOYT+u5x/SP7skw0/UM9ztKg7C7kyjnzj2Q14AgvZfgEV6LJVgbbPG5uCVjT5maKFZTcvd+INWG1ULcZ1w1+kBcXFTaiKMaYwq+oYz+r8c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 0F98C1516; Thu, 13 Mar 2025 08:29:35 -0700 (PDT) Received: from e133711.arm.com (e133711.arm.com [10.1.196.55]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8E0C43F694; Thu, 13 Mar 2025 08:29:23 -0700 (PDT) From: Sudeep Holla Date: Thu, 13 Mar 2025 15:28:55 +0000 Subject: [PATCH v3 09/13] soc: hisilicon: kunpeng_hccs: Simplify PCC shared memory region handling Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-pcc_fixes_updates-v3-9-019a4aa74d0f@arm.com> References: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> In-Reply-To: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sudeep Holla , Jassi Brar , Huisong Li , Adam Young , Robbie King X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=6401; i=sudeep.holla@arm.com; h=from:subject:message-id; bh=9UGEN/buW+rB+SNY16YtJWZHD/wQwocyB/zk8N1p+qs=; b=owEBbQKS/ZANAwAIAQBBurwxfuKYAcsmYgBn0vnEjLDGeiFtUHX3lp2qdYi1z87RhsWIcM0zw me3g/9VTDOJAjMEAAEIAB0WIQS6ceUSBvMeskPdk+EAQbq8MX7imAUCZ9L5xAAKCRAAQbq8MX7i mO9QEACymV4HwlcVu+PhEDoXx0TflXryjg4RqwngE0k66IS3MdT0MfLxwN9+H8q57SCK7j+TDTe Tbavp9n1iBHNDcshv/M6zp39UPSaWUBLono4shZ7L+Lvs4eD52k2VtLcvhQMTbboUxGQqiRTTbC lATaI3PB7wrL5qw/s9NDWVl0/9+zpX5irHqFKztMPZRrm6dwzZ77Go7F7u6BrkY7wC/KIS45C4g sjGMfxCGKijW4hEagPY6FiwThoGwt9muHVfMsXQ/XHe6WRuREO33KrT39oHJuHcGM8lS2DuA65x 2YsiAT59leFAS3//5J89+VOM1Sg4DDNS6IBBUCSBzi516BTzq9wEkazZfoF53OmAdau1gH205DH H3aUay5YWWXOo26ZyLSop0jhZXqCGLMl4xLjzQ+ltR4jc8jl/sad6UyyIu0oYqulabZpyaOU7Xd bETa2kXnatexFKlYERNA/JR+Cf0KJYc4DxaqZ4IP5MQd4oVu6tBZA+J32gwtD8oVjBiRbSEdSq4 GaQIrISiMbgBpz+ZEOgYxG2/YRyLUrcelaxCue4/DX6Tyfv6oQV/T1d/fMCRAaKRaIufmyfdFw4 jmSghBIw3+d8kLRgov74tmwtx6GnrlkraYZrDYD67KrhQq9FHC7ltMr6+cU7/3spOnQB/w6i/Xr B7hyFqQo1jRpZ5g== X-Developer-Key: i=sudeep.holla@arm.com; a=openpgp; fpr=7360A21742ADF5A11767C1C139CFD4755FE2D5B4 The PCC driver now handles mapping and unmapping of shared memory areas as part of pcc_mbox_{request,free}_channel(). Without these before, this Kunpeng HCCS driver did handling of those mappings like several other PCC mailbox client drivers. There were redundant operations, leading to unnecessary code. Maintaining the consistency across these driver was harder due to scattered handling of shmem. Just use the mapped shmem and remove all redundant operations from this driver. Cc: Huisong Li Reviewed-by: Huisong Li Signed-off-by: Sudeep Holla --- drivers/soc/hisilicon/kunpeng_hccs.c | 42 +++++++++++++----------------------- drivers/soc/hisilicon/kunpeng_hccs.h | 2 -- 2 files changed, 15 insertions(+), 29 deletions(-) diff --git a/drivers/soc/hisilicon/kunpeng_hccs.c b/drivers/soc/hisilicon/kunpeng_hccs.c index 8aa8dec14911cdcdc2a2d11606bf6159144e9489..02b2e5ce40b313c8c3cf462c5c2f1d0c53f612f6 100644 --- a/drivers/soc/hisilicon/kunpeng_hccs.c +++ b/drivers/soc/hisilicon/kunpeng_hccs.c @@ -167,10 +167,6 @@ static void hccs_pcc_rx_callback(struct mbox_client *cl, void *mssg) static void hccs_unregister_pcc_channel(struct hccs_dev *hdev) { - struct hccs_mbox_client_info *cl_info = &hdev->cl_info; - - if (cl_info->pcc_comm_addr) - iounmap(cl_info->pcc_comm_addr); pcc_mbox_free_channel(hdev->cl_info.pcc_chan); } @@ -179,6 +175,7 @@ static int hccs_register_pcc_channel(struct hccs_dev *hdev) struct hccs_mbox_client_info *cl_info = &hdev->cl_info; struct mbox_client *cl = &cl_info->client; struct pcc_mbox_chan *pcc_chan; + struct mbox_chan *mbox_chan; struct device *dev = hdev->dev; int rc; @@ -196,7 +193,7 @@ static int hccs_register_pcc_channel(struct hccs_dev *hdev) goto out; } cl_info->pcc_chan = pcc_chan; - cl_info->mbox_chan = pcc_chan->mchan; + mbox_chan = pcc_chan->mchan; /* * pcc_chan->latency is just a nominal value. In reality the remote @@ -206,34 +203,24 @@ static int hccs_register_pcc_channel(struct hccs_dev *hdev) cl_info->deadline_us = HCCS_PCC_CMD_WAIT_RETRIES_NUM * pcc_chan->latency; if (!hdev->verspec_data->has_txdone_irq && - cl_info->mbox_chan->mbox->txdone_irq) { + mbox_chan->mbox->txdone_irq) { dev_err(dev, "PCC IRQ in PCCT is enabled.\n"); rc = -EINVAL; goto err_mbx_channel_free; } else if (hdev->verspec_data->has_txdone_irq && - !cl_info->mbox_chan->mbox->txdone_irq) { + !mbox_chan->mbox->txdone_irq) { dev_err(dev, "PCC IRQ in PCCT isn't supported.\n"); rc = -EINVAL; goto err_mbx_channel_free; } - if (!pcc_chan->shmem_base_addr || - pcc_chan->shmem_size != HCCS_PCC_SHARE_MEM_BYTES) { - dev_err(dev, "The base address or size (%llu) of PCC communication region is invalid.\n", - pcc_chan->shmem_size); + if (pcc_chan->shmem_size != HCCS_PCC_SHARE_MEM_BYTES) { + dev_err(dev, "Base size (%llu) of PCC communication region must be %d bytes.\n", + pcc_chan->shmem_size, HCCS_PCC_SHARE_MEM_BYTES); rc = -EINVAL; goto err_mbx_channel_free; } - cl_info->pcc_comm_addr = ioremap(pcc_chan->shmem_base_addr, - pcc_chan->shmem_size); - if (!cl_info->pcc_comm_addr) { - dev_err(dev, "Failed to ioremap PCC communication region for channel-%u.\n", - hdev->chan_id); - rc = -ENOMEM; - goto err_mbx_channel_free; - } - return 0; err_mbx_channel_free: @@ -246,7 +233,7 @@ static int hccs_wait_cmd_complete_by_poll(struct hccs_dev *hdev) { struct hccs_mbox_client_info *cl_info = &hdev->cl_info; struct acpi_pcct_shared_memory __iomem *comm_base = - cl_info->pcc_comm_addr; + cl_info->pcc_chan->shmem; u16 status; int ret; @@ -289,7 +276,7 @@ static inline void hccs_fill_pcc_shared_mem_region(struct hccs_dev *hdev, .status = 0, }; - memcpy_toio(hdev->cl_info.pcc_comm_addr, (void *)&tmp, + memcpy_toio(hdev->cl_info.pcc_chan->shmem, (void *)&tmp, sizeof(struct acpi_pcct_shared_memory)); /* Copy the message to the PCC comm space */ @@ -309,7 +296,7 @@ static inline void hccs_fill_ext_pcc_shared_mem_region(struct hccs_dev *hdev, .command = cmd, }; - memcpy_toio(hdev->cl_info.pcc_comm_addr, (void *)&tmp, + memcpy_toio(hdev->cl_info.pcc_chan->shmem, (void *)&tmp, sizeof(struct acpi_pcct_ext_pcc_shared_memory)); /* Copy the message to the PCC comm space */ @@ -321,12 +308,13 @@ static int hccs_pcc_cmd_send(struct hccs_dev *hdev, u8 cmd, { const struct hccs_verspecific_data *verspec_data = hdev->verspec_data; struct hccs_mbox_client_info *cl_info = &hdev->cl_info; + struct mbox_chan *mbox_chan = cl_info->pcc_chan->mchan; struct hccs_fw_inner_head *fw_inner_head; void __iomem *comm_space; u16 space_size; int ret; - comm_space = cl_info->pcc_comm_addr + verspec_data->shared_mem_size; + comm_space = cl_info->pcc_chan->shmem + verspec_data->shared_mem_size; space_size = HCCS_PCC_SHARE_MEM_BYTES - verspec_data->shared_mem_size; verspec_data->fill_pcc_shared_mem(hdev, cmd, desc, comm_space, space_size); @@ -334,7 +322,7 @@ static int hccs_pcc_cmd_send(struct hccs_dev *hdev, u8 cmd, reinit_completion(&cl_info->done); /* Ring doorbell */ - ret = mbox_send_message(cl_info->mbox_chan, &cmd); + ret = mbox_send_message(mbox_chan, &cmd); if (ret < 0) { dev_err(hdev->dev, "Send PCC mbox message failed, ret = %d.\n", ret); @@ -356,9 +344,9 @@ static int hccs_pcc_cmd_send(struct hccs_dev *hdev, u8 cmd, end: if (verspec_data->has_txdone_irq) - mbox_chan_txdone(cl_info->mbox_chan, ret); + mbox_chan_txdone(mbox_chan, ret); else - mbox_client_txdone(cl_info->mbox_chan, ret); + mbox_client_txdone(mbox_chan, ret); return ret; } diff --git a/drivers/soc/hisilicon/kunpeng_hccs.h b/drivers/soc/hisilicon/kunpeng_hccs.h index dc267136919b7bf3ecc0deb8cf7291267dd91789..f0a9a5618d9735e959633059192449b10d5bbf16 100644 --- a/drivers/soc/hisilicon/kunpeng_hccs.h +++ b/drivers/soc/hisilicon/kunpeng_hccs.h @@ -60,10 +60,8 @@ struct hccs_chip_info { struct hccs_mbox_client_info { struct mbox_client client; - struct mbox_chan *mbox_chan; struct pcc_mbox_chan *pcc_chan; u64 deadline_us; - void __iomem *pcc_comm_addr; struct completion done; }; From patchwork Thu Mar 13 15:28:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 14015292 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id ABFD626A0C7; Thu, 13 Mar 2025 15:29:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879768; cv=none; b=JuoJ/t2tVgfAJYs8wDDjYY5NXS2pN0vjpK86MB2b0R25bFB9T7eb9lXHLp3fIUSqKZjOx8i3oFDCZa9UtB8UyBHjYqUuF3mSaJxKXpZdbn2aBnz0P6yf+n4H8vf1Hf6GoZSR6+yr52FRMKQxE/baNOSErTRF5JTEQKffz6K9XRk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879768; c=relaxed/simple; bh=MfSTY+8Javma4iMKIMRIP5AOm3S32ksYO4b7JbopmcE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gryJjGWJOgyefA9oF3uzbr6imU3Q7+Sj8EHSIjQt+HEuKYrcgjfyMdQsEUAgHsDnpeeCg1t3Ch96uzmXMm89qvKlg7p9Q9LPj9DtdwmsoJtdThulWMLnW0TcqU+/JKPNThZY5E78xnPKUvYFhqtYT0dzTQX5EYaiwvleT/ozFpQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 C9E8D1F91; Thu, 13 Mar 2025 08:29:36 -0700 (PDT) Received: from e133711.arm.com (e133711.arm.com [10.1.196.55]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0CCFA3F694; Thu, 13 Mar 2025 08:29:24 -0700 (PDT) From: Sudeep Holla Date: Thu, 13 Mar 2025 15:28:56 +0000 Subject: [PATCH v3 10/13] i2c: xgene-slimpro: Simplify PCC shared memory region handling Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-pcc_fixes_updates-v3-10-019a4aa74d0f@arm.com> References: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> In-Reply-To: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sudeep Holla , Jassi Brar , Huisong Li , Adam Young , Robbie King , Andi Shyti , linux-i2c@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3735; i=sudeep.holla@arm.com; h=from:subject:message-id; bh=MfSTY+8Javma4iMKIMRIP5AOm3S32ksYO4b7JbopmcE=; b=owEBbQKS/ZANAwAIAQBBurwxfuKYAcsmYgBn0vnECAkFm0g4ggECz10cy8pN/4x3dJjvyoS7c BFd5gCqqs2JAjMEAAEIAB0WIQS6ceUSBvMeskPdk+EAQbq8MX7imAUCZ9L5xAAKCRAAQbq8MX7i mFhoEADJhHjPfVYHP9j+YNYHDWqa0U5K8kY635HEcqa4mvxMeAnBw/ydgkzg4z1Cwva4cXyzzBM 23yiRRTCageAHMmCDBkSv+x9zkhWf8+nh4uO/CqLvSgZ3tBIu2b2IdxwB8vTHrzmF3T+VgE4l0g cM34CUpZIdfl0pzLa11fA3OYNraMLmBJbXjm60NMLdt72pXElQXNGAedPvwWw5hldDkJKDwVq8u 8RRZc9s+KIryyFp3D8oP4IB3u7I2xTltQarhynLNwrbGEPQarP86KXE4esmWCSS9m3ARATTfce1 45pjxzX3O8cQH7SKi5PUNW76kQPlrJkdqxE0ywwDPaW0zVW3i4NAZbOKgXIA/DLzyo0UDcbcltH OvprmFjfF+UGCauYnkdhU4oOp1WnDwwEsrLX596CS5Y5umOIWPaLZkVGOxX9uVSL/7HLaHeO+hg e/fOQA8eXJXaSAHEyABHOesdontefLkjeCUscxgjfuXSnmn1uV7HtjW7ZmManoDvEssZSNMDQjY MG21LXdkYS2anzppHcwYedtZeHOhX+kQb2FQ7mrytqVZWPFRrFFi5n+BCV/APUl9KzgAR6BLt/b sGv91/0T1XR1QCmvDm9MqD8nNe4os7TurEMF7sWjq0RiP22G+yCmhTz9Erzt5viMdFbpE1K4rSh pJJCQl/GV38e1Kg== X-Developer-Key: i=sudeep.holla@arm.com; a=openpgp; fpr=7360A21742ADF5A11767C1C139CFD4755FE2D5B4 The PCC driver now handles mapping and unmapping of shared memory areas as part of pcc_mbox_{request,free}_channel(). Without these before, this xgene-slimpro I2C driver did handling of those mappings like several other PCC mailbox client drivers. There were redundant operations, leading to unnecessary code. Maintaining the consistency across these driver was harder due to scattered handling of shmem. Just use the mapped shmem and remove all redundant operations from this driver. Cc: Andi Shyti Cc: linux-i2c@vger.kernel.org Signed-off-by: Sudeep Holla Acked-by: Andi Shyti --- drivers/i2c/busses/i2c-xgene-slimpro.c | 39 ++++------------------------------ 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/drivers/i2c/busses/i2c-xgene-slimpro.c b/drivers/i2c/busses/i2c-xgene-slimpro.c index 663fe5604dd64b80e57f906e1f7430dcf6d5e95b..a0880f4a056d2b8abbac9f58416215a7fc9b130e 100644 --- a/drivers/i2c/busses/i2c-xgene-slimpro.c +++ b/drivers/i2c/busses/i2c-xgene-slimpro.c @@ -101,8 +101,6 @@ struct slimpro_i2c_dev { struct completion rd_complete; u8 dma_buffer[I2C_SMBUS_BLOCK_MAX + 1]; /* dma_buffer[0] is used for length */ u32 *resp_msg; - phys_addr_t comm_base_addr; - void *pcc_comm_addr; }; #define to_slimpro_i2c_dev(cl) \ @@ -148,7 +146,8 @@ static void slimpro_i2c_rx_cb(struct mbox_client *cl, void *mssg) static void slimpro_i2c_pcc_rx_cb(struct mbox_client *cl, void *msg) { struct slimpro_i2c_dev *ctx = to_slimpro_i2c_dev(cl); - struct acpi_pcct_shared_memory *generic_comm_base = ctx->pcc_comm_addr; + struct acpi_pcct_shared_memory __iomem *generic_comm_base = + ctx->pcc_chan->shmem; /* Check if platform sends interrupt */ if (!xgene_word_tst_and_clr(&generic_comm_base->status, @@ -169,7 +168,8 @@ static void slimpro_i2c_pcc_rx_cb(struct mbox_client *cl, void *msg) static void slimpro_i2c_pcc_tx_prepare(struct slimpro_i2c_dev *ctx, u32 *msg) { - struct acpi_pcct_shared_memory *generic_comm_base = ctx->pcc_comm_addr; + struct acpi_pcct_shared_memory __iomem *generic_comm_base = + ctx->pcc_chan->shmem; u32 *ptr = (void *)(generic_comm_base + 1); u16 status; int i; @@ -464,15 +464,12 @@ static int xgene_slimpro_i2c_probe(struct platform_device *pdev) } else { struct pcc_mbox_chan *pcc_chan; const struct acpi_device_id *acpi_id; - int version = XGENE_SLIMPRO_I2C_V1; acpi_id = acpi_match_device(pdev->dev.driver->acpi_match_table, &pdev->dev); if (!acpi_id) return -EINVAL; - version = (int)acpi_id->driver_data; - if (device_property_read_u32(&pdev->dev, "pcc-channel", &ctx->mbox_idx)) ctx->mbox_idx = MAILBOX_I2C_INDEX; @@ -494,34 +491,6 @@ static int xgene_slimpro_i2c_probe(struct platform_device *pdev) goto mbox_err; } - /* - * This is the shared communication region - * for the OS and Platform to communicate over. - */ - ctx->comm_base_addr = pcc_chan->shmem_base_addr; - if (ctx->comm_base_addr) { - if (version == XGENE_SLIMPRO_I2C_V2) - ctx->pcc_comm_addr = memremap( - ctx->comm_base_addr, - pcc_chan->shmem_size, - MEMREMAP_WT); - else - ctx->pcc_comm_addr = memremap( - ctx->comm_base_addr, - pcc_chan->shmem_size, - MEMREMAP_WB); - } else { - dev_err(&pdev->dev, "Failed to get PCC comm region\n"); - rc = -ENOENT; - goto mbox_err; - } - - if (!ctx->pcc_comm_addr) { - dev_err(&pdev->dev, - "Failed to ioremap PCC comm region\n"); - rc = -ENOMEM; - goto mbox_err; - } } rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); if (rc) From patchwork Thu Mar 13 15:28:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 14015293 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BE15B268FF9; Thu, 13 Mar 2025 15:29:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879770; cv=none; b=TfQFynoblgpnfN7FoG5mIKktqGdLm5PuwLbUDOk9TA2FZTM/io47a1MathixV0C/RU1dfCulwH+6kQ6h/BMqIFRPXNclIZb0uQa/m88yw40vQyGvdAv57zx8wu/BHCUCzHbQKJAA8AQnAgjKkygsp/op7Q4q/qocgaH2Mxel61k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879770; c=relaxed/simple; bh=g2RUvDMQ2GBh1kicDpIWYqj1etweoptS+UnASfqEnjU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FWp0Vkpjvz1ZyyZ4Z6LUFiPjVY+nWM76bvfdZhxRiJRa8eSM79NVoxl5oJ3bitSYqovPcClEO6T1P2kkuGtc4RAuys3p55G0khGvLV9D410JJ77EtoHeU+KrG9WHzG0zB4TIaRtEmQEs1X4Ms0FXCqyVbJWIvdVhB0BTqEvCaVY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 B38581516; Thu, 13 Mar 2025 08:29:38 -0700 (PDT) Received: from e133711.arm.com (e133711.arm.com [10.1.196.55]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C70113F694; Thu, 13 Mar 2025 08:29:26 -0700 (PDT) From: Sudeep Holla Date: Thu, 13 Mar 2025 15:28:57 +0000 Subject: [PATCH v3 11/13] hwmon: (xgene-hwmon) Simplify PCC shared memory region handling Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-pcc_fixes_updates-v3-11-019a4aa74d0f@arm.com> References: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> In-Reply-To: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sudeep Holla , Jassi Brar , Huisong Li , Adam Young , Robbie King , Jean Delvare , Guenter Roeck , linux-hwmon@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3739; i=sudeep.holla@arm.com; h=from:subject:message-id; bh=g2RUvDMQ2GBh1kicDpIWYqj1etweoptS+UnASfqEnjU=; b=owEBbQKS/ZANAwAIAQBBurwxfuKYAcsmYgBn0vnE4FydmkyNvEATnXYkie6JdXUFcWu91UUbb a4XUAfUw6OJAjMEAAEIAB0WIQS6ceUSBvMeskPdk+EAQbq8MX7imAUCZ9L5xAAKCRAAQbq8MX7i mLNHEADHv4egWlf3fUQ+XNfYRbFc0rKJWGm6QvNzZgmLAkYX5IM2LwYsfdArTAslOhl7X+B5mHt jUpS2np6N8aA6dLa6LYanNRU+++HKeMv3fIWz49zruzgy8uP+n75t1Vg9rFI5RQniXBt4UDcn9u SKyEVtv50AqPsStPgWow43jqKq3eMThiHn4a1bnjJplXc95U3R2vMYUsFHTVjb6GqNVg9PvonRu VUDGNko/X5CwvtbBLzckB6neaHVPZu70rMYt5NeBck+uuZg9ECFVta1trcB7QSfI6/M43X80T9S U3bL2XIEO+d38wdyje0kM6t3miT7pXJ+dwEK1NgxYXg49Wx0XCXt+OJZwXiICofRQgzke3r7Kc0 NESYdXn2CGvYU1bLum5oftaqgDiQQSJ07mHginHXmzWrGKEsS9HHkNyy72P+DwaRmv37wnfllKs 6AU0+Mm4sF6nCb7Up+sj758W2qF9BF9aERVr6zMiFVBKo5dJkqgcrB/oFV2eWW9g59/EbPcydT8 ICQF0lKMvsvqfYvrdV7CppRfQtNwkHEZKd0mcDACSr7w52k89/itnipfv/w9YDjsERNGWJAHkjp SPpBGJFnQZ5/ogakdq0ilFwAh6iPhOZpLsvPx36S+w16Yb7jj3FpTPER6ENT6jRNY20+N7Z5pXn ooDxpyfSwCPTSqA== X-Developer-Key: i=sudeep.holla@arm.com; a=openpgp; fpr=7360A21742ADF5A11767C1C139CFD4755FE2D5B4 The PCC driver now handles mapping and unmapping of shared memory areas as part of pcc_mbox_{request,free}_channel(). Without these before, this xgene hwmon driver did handling of those mappings like several other PCC mailbox client drivers. There were redundant operations, leading to unnecessary code. Maintaining the consistency across these driver was harder due to scattered handling of shmem. Just use the mapped shmem and remove all redundant operations from this driver. Cc: Jean Delvare Cc: Guenter Roeck Cc: linux-hwmon@vger.kernel.org Acked-by: Guenter Roeck Signed-off-by: Sudeep Holla --- drivers/hwmon/xgene-hwmon.c | 40 ++++------------------------------------ 1 file changed, 4 insertions(+), 36 deletions(-) diff --git a/drivers/hwmon/xgene-hwmon.c b/drivers/hwmon/xgene-hwmon.c index 7087197383c96cb97e4623f419afed01d4f3c716..ea350d4de902c4e6fc4de1cd54a8b75edfad1119 100644 --- a/drivers/hwmon/xgene-hwmon.c +++ b/drivers/hwmon/xgene-hwmon.c @@ -102,9 +102,6 @@ struct xgene_hwmon_dev { struct device *hwmon_dev; bool temp_critical_alarm; - - phys_addr_t comm_base_addr; - void *pcc_comm_addr; u64 usecs_lat; }; @@ -125,7 +122,8 @@ static u16 xgene_word_tst_and_clr(u16 *addr, u16 mask) static int xgene_hwmon_pcc_rd(struct xgene_hwmon_dev *ctx, u32 *msg) { - struct acpi_pcct_shared_memory *generic_comm_base = ctx->pcc_comm_addr; + struct acpi_pcct_shared_memory __iomem *generic_comm_base = + ctx->pcc_chan->shmem; u32 *ptr = (void *)(generic_comm_base + 1); int rc, i; u16 val; @@ -523,7 +521,8 @@ static void xgene_hwmon_rx_cb(struct mbox_client *cl, void *msg) static void xgene_hwmon_pcc_rx_cb(struct mbox_client *cl, void *msg) { struct xgene_hwmon_dev *ctx = to_xgene_hwmon_dev(cl); - struct acpi_pcct_shared_memory *generic_comm_base = ctx->pcc_comm_addr; + struct acpi_pcct_shared_memory __iomem *generic_comm_base = + ctx->pcc_chan->shmem; struct slimpro_resp_msg amsg; /* @@ -649,7 +648,6 @@ static int xgene_hwmon_probe(struct platform_device *pdev) } else { struct pcc_mbox_chan *pcc_chan; const struct acpi_device_id *acpi_id; - int version; acpi_id = acpi_match_device(pdev->dev.driver->acpi_match_table, &pdev->dev); @@ -658,8 +656,6 @@ static int xgene_hwmon_probe(struct platform_device *pdev) goto out_mbox_free; } - version = (int)acpi_id->driver_data; - if (device_property_read_u32(&pdev->dev, "pcc-channel", &ctx->mbox_idx)) { dev_err(&pdev->dev, "no pcc-channel property\n"); @@ -685,34 +681,6 @@ static int xgene_hwmon_probe(struct platform_device *pdev) goto out; } - /* - * This is the shared communication region - * for the OS and Platform to communicate over. - */ - ctx->comm_base_addr = pcc_chan->shmem_base_addr; - if (ctx->comm_base_addr) { - if (version == XGENE_HWMON_V2) - ctx->pcc_comm_addr = (void __force *)devm_ioremap(&pdev->dev, - ctx->comm_base_addr, - pcc_chan->shmem_size); - else - ctx->pcc_comm_addr = devm_memremap(&pdev->dev, - ctx->comm_base_addr, - pcc_chan->shmem_size, - MEMREMAP_WB); - } else { - dev_err(&pdev->dev, "Failed to get PCC comm region\n"); - rc = -ENODEV; - goto out; - } - - if (IS_ERR_OR_NULL(ctx->pcc_comm_addr)) { - dev_err(&pdev->dev, - "Failed to ioremap PCC comm region\n"); - rc = -ENOMEM; - goto out; - } - /* * pcc_chan->latency is just a Nominal value. In reality * the remote processor could be much slower to reply. From patchwork Thu Mar 13 15:28:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 14015294 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D928D26A0C7; Thu, 13 Mar 2025 15:29:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879772; cv=none; b=UJU/JyYPaxNdwbxaoY00UIzQs1Y6r+jzW/gp6s9AIEw1az71luJmxD+ftSteeYu0aUDsLPv04ewPmekypGGCLCKGIiQkPygppExj8ym/g9Cg/GO+W8tRsyQBIlSt78rBhTLdeZ0zMhRzbGmRSkfop9fPqW+8dYxrCr2n0srXRG4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879772; c=relaxed/simple; bh=tFkBXBO/atiCQgL+I5PaOZGXAVe1jBN5O3xNDo6yR1U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KbTSKUfsgrjXDbXb+Cz57vH+MG0uLl6rqXGvg7wzojduSV588uicuYDcpYCSJ+MeRZERylnYxms94BLs32L6Xq2JDacCyAbQ9w6jhWaW7EPnsbFYjn7iN9l6pV1Qti5qYET0r0zwUltTkQpgzUcr+/DiPKnlSpvz6efrV+1EBj8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 5675B1F91; Thu, 13 Mar 2025 08:29:40 -0700 (PDT) Received: from e133711.arm.com (e133711.arm.com [10.1.196.55]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id B0E8C3F694; Thu, 13 Mar 2025 08:29:28 -0700 (PDT) From: Sudeep Holla Date: Thu, 13 Mar 2025 15:28:58 +0000 Subject: [PATCH v3 12/13] ACPI: PCC: Simplify PCC shared memory region handling Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-pcc_fixes_updates-v3-12-019a4aa74d0f@arm.com> References: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> In-Reply-To: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sudeep Holla , Jassi Brar , Huisong Li , Adam Young , Robbie King , "Rafael J. Wysocki" X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2287; i=sudeep.holla@arm.com; h=from:subject:message-id; bh=tFkBXBO/atiCQgL+I5PaOZGXAVe1jBN5O3xNDo6yR1U=; b=owEBbQKS/ZANAwAIAQBBurwxfuKYAcsmYgBn0vnFSHJPryKt07vGcR36CZ3Tqoh24jxtYMB9V LxA15/K79yJAjMEAAEIAB0WIQS6ceUSBvMeskPdk+EAQbq8MX7imAUCZ9L5xQAKCRAAQbq8MX7i mHKRD/9NVdNYHghHeULoS8iAYKizbx6vIkwD75/H/+NAGPhtqEPDMpU/610A5bbuHziCX0OCTJ3 8x5l4X2wqefQXo3RkB/O0whfjEcT5dLo0K9SVQxIiOmpkxhe5HPv6eIcjLWhPHwE03MwNcTAAaj 7IJPtBUJ3duIuaLOdyL1oQEFGWsw40E+bGKgd7GXYybZAo5FJ+KxkIbIbETjP+FYbKSHOrm1Ayg AYEaWp+W87XQAdaXmY5U/BJpzEjkMv2U/kfw9ODFDD38vg+ZrgXJwpaz0AkNz86umLsrCoBOqN1 m3s7m/bfwgRnz6bLaml7VxP3NBpTKzIyKwrYOOcveMKaHdPwyHbGh1teTbgzD9Ji3LCKRBhlXKO UH7jFatj3v/9s5+eQZim0FIFYBU2+d3U7cCsD9QIUOLoyqE/HkJ3/iw0ufA0PyAtQnYa0rP06pS HxEGqZhxh66XoNcEVJ3M/Xp7S83UgFSHtYBxB12ES4pNI5K72bMkSKDxeJSNI6x3/TD7ussZeqN 3T/inRnrub/90eWeI6AyuAo5u8s0DwSCxri3lAB8jaMvl7PYqL4rEWh3e6TU4WHe0/+EH1YptBS azWez6IsZcTHfqKgZiKpTbPKRsvPhhqIph1twEwOZfejmvOMfMeLesd8nJ/l+qPzUC8J5wUNk8j IsACwertPVL3xnw== X-Developer-Key: i=sudeep.holla@arm.com; a=openpgp; fpr=7360A21742ADF5A11767C1C139CFD4755FE2D5B4 The PCC driver now handles mapping and unmapping of shared memory areas as part of pcc_mbox_{request,free}_channel(). Without these before, this ACPI PCC opregion driver did handling of those mappings like several other PCC mailbox client drivers. There were redundant operations, leading to unnecessary code. Maintaining the consistency across these driver was harder due to scattered handling of shmem. Just use the mapped shmem and remove all redundant operations from this driver. Cc: "Rafael J. Wysocki" Signed-off-by: Sudeep Holla tested-by: Adam Young --- drivers/acpi/acpi_pcc.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/acpi/acpi_pcc.c b/drivers/acpi/acpi_pcc.c index 07a034a53acac1e8307265bcc5572054d34d971f..97064e943768ad9f1704effa13dddbc0876a9452 100644 --- a/drivers/acpi/acpi_pcc.c +++ b/drivers/acpi/acpi_pcc.c @@ -31,7 +31,6 @@ struct pcc_data { struct pcc_mbox_chan *pcc_chan; - void __iomem *pcc_comm_addr; struct completion done; struct mbox_client cl; struct acpi_pcc_info ctx; @@ -81,14 +80,6 @@ acpi_pcc_address_space_setup(acpi_handle region_handle, u32 function, ret = AE_SUPPORT; goto err_free_channel; } - data->pcc_comm_addr = acpi_os_ioremap(pcc_chan->shmem_base_addr, - pcc_chan->shmem_size); - if (!data->pcc_comm_addr) { - pr_err("Failed to ioremap PCC comm region mem for %d\n", - ctx->subspace_id); - ret = AE_NO_MEMORY; - goto err_free_channel; - } *region_context = data; return AE_OK; @@ -113,7 +104,7 @@ acpi_pcc_address_space_handler(u32 function, acpi_physical_address addr, reinit_completion(&data->done); /* Write to Shared Memory */ - memcpy_toio(data->pcc_comm_addr, (void *)value, data->ctx.length); + memcpy_toio(data->pcc_chan->shmem, (void *)value, data->ctx.length); ret = mbox_send_message(data->pcc_chan->mchan, NULL); if (ret < 0) @@ -134,7 +125,7 @@ acpi_pcc_address_space_handler(u32 function, acpi_physical_address addr, mbox_chan_txdone(data->pcc_chan->mchan, ret); - memcpy_fromio(value, data->pcc_comm_addr, data->ctx.length); + memcpy_fromio(value, data->pcc_chan->shmem, data->ctx.length); return AE_OK; } From patchwork Thu Mar 13 15:28:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 14015295 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4BA6726A1D0; Thu, 13 Mar 2025 15:29:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879773; cv=none; b=Yx80IuYO56kpckcXMrdUCucmdjYQq8AEIuBKheKhnBVMGg3LNOrNwzfs/YOT4JNLDiop2WMBXZiDWsqaDN5qNqpYqx8Qz10aS6UV9ZpJDLT6Axzaw6Bp7WS86f2Xkd5XwP0kCsrEAIhb43jTbpXjEA2j1ZCCV1E6i+31iTnqLSg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741879773; c=relaxed/simple; bh=aXg6RgwqMQoYUSR7L+4RvyibSNxPKGi4o12ZLke9smI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FWGibt1/13jeNZYEaLYWf7zdm/rnTuxc9mV1zP04RlfuE7i676WUm87p6dG7fq4y1JZKVeNyXXU+IGIyLBjyS3vDDJy61872XzoWKYZuwzqaF756zkbmnsdS4E3DKD1wa2ke9PeC0isY5Jg9iCUgJlairm9sjvAkszj4DUnkv1E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 ECE99201B; Thu, 13 Mar 2025 08:29:41 -0700 (PDT) Received: from e133711.arm.com (e133711.arm.com [10.1.196.55]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 536A33F694; Thu, 13 Mar 2025 08:29:30 -0700 (PDT) From: Sudeep Holla Date: Thu, 13 Mar 2025 15:28:59 +0000 Subject: [PATCH v3 13/13] ACPI: CPPC: Simplify PCC shared memory region handling Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-pcc_fixes_updates-v3-13-019a4aa74d0f@arm.com> References: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> In-Reply-To: <20250313-pcc_fixes_updates-v3-0-019a4aa74d0f@arm.com> To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sudeep Holla , Jassi Brar , Huisong Li , Adam Young , Robbie King , "Rafael J. Wysocki" X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2920; i=sudeep.holla@arm.com; h=from:subject:message-id; bh=aXg6RgwqMQoYUSR7L+4RvyibSNxPKGi4o12ZLke9smI=; b=owEBbQKS/ZANAwAIAQBBurwxfuKYAcsmYgBn0vnFlGRXwjy9cTaaMj/r+JhxSEJ57FZdBydxK 1a8OYIWgDCJAjMEAAEIAB0WIQS6ceUSBvMeskPdk+EAQbq8MX7imAUCZ9L5xQAKCRAAQbq8MX7i mJfHD/9er9/XFfWSnZPvTNnmLDJwIrPdU9JK/+seka+nu4TghpzbUe8J6vvCiUUVCrx/n1Incjg VGLbRP/MSpIgDoAKXgNgW8Cz4HF7fxbOmDeyihn0/g6JIsYlPq/UXwqdwirSbwDcjqku/GOfgEd dqFk9ofzSIYISae8m1O6Q+z6sZ7qD4sFFLR/iDYiKuEiAoPBPUoSgVP158syGWVJVMWmpO0xz0B BtHeOxriZYzb4YkrXvrTUe/vLYBVkvwZaJyUMOwdWpBkpagdhlQxowIjLH2Prtqen+pyAvBV/0z IvmzIjdB76qXkh9e2579JiDpOnyEiisePjbjYGPfyiwzWpQYzYrCrXYlYwTtF6bLP2eKhSsrN8k DyBnclrqdTJPMIg89tIaentznacDmAqkd9AYv+G+qrMgDe2a14UlV25wuUYKnmgWzwrE9xy6SWz xmiJsSDoo+6Se0hXl1r71Boc60zqeo+MGOWRPTE59uqSBxPuop3NAZ2CBIDRV9CapTfBHeu8ibF YlWbllMFj39ZSnsBSiDeNaInb4xynstu5Q+gz2Z3DcfP0/Rmbe9tyH2/MgKfC1k1EHKR7IBeZEi BET/4O2v/LH7kPFAdqXsuYtqhSC4DmHuyYp2WPCNLWslts+lLtBZWuS+bIkwiuOTnlemOXgADNh hR/1u6rr0GWS0dg== X-Developer-Key: i=sudeep.holla@arm.com; a=openpgp; fpr=7360A21742ADF5A11767C1C139CFD4755FE2D5B4 The PCC driver now handles mapping and unmapping of shared memory areas as part of pcc_mbox_{request,free}_channel(). Without these before, this ACPI CPPC driver did handling of those mappings like several other PCC mailbox client drivers. There were redundant operations, leading to unnecessary code. Maintaining the consistency across these driver was harder due to scattered handling of shmem. Just use the mapped shmem and remove all redundant operations from this driver. Cc: Rafael J. Wysocki Acked-by: Rafael J. Wysocki Signed-off-by: Sudeep Holla --- drivers/acpi/cppc_acpi.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c index f193e713825ac24203ece5f94d6cf99dd4724ce4..d972157a79b6ade2f3738c90128e8692141b3ee5 100644 --- a/drivers/acpi/cppc_acpi.c +++ b/drivers/acpi/cppc_acpi.c @@ -47,7 +47,6 @@ struct cppc_pcc_data { struct pcc_mbox_chan *pcc_channel; - void __iomem *pcc_comm_addr; bool pcc_channel_acquired; unsigned int deadline_us; unsigned int pcc_mpar, pcc_mrtt, pcc_nominal; @@ -95,7 +94,7 @@ static DEFINE_PER_CPU(int, cpu_pcc_subspace_idx); static DEFINE_PER_CPU(struct cpc_desc *, cpc_desc_ptr); /* pcc mapped address + header size + offset within PCC subspace */ -#define GET_PCC_VADDR(offs, pcc_ss_id) (pcc_data[pcc_ss_id]->pcc_comm_addr + \ +#define GET_PCC_VADDR(offs, pcc_ss_id) (pcc_data[pcc_ss_id]->pcc_channel->shmem + \ 0x8 + (offs)) /* Check if a CPC register is in PCC */ @@ -223,7 +222,7 @@ static int check_pcc_chan(int pcc_ss_id, bool chk_err_bit) int ret, status; struct cppc_pcc_data *pcc_ss_data = pcc_data[pcc_ss_id]; struct acpi_pcct_shared_memory __iomem *generic_comm_base = - pcc_ss_data->pcc_comm_addr; + pcc_ss_data->pcc_channel->shmem; if (!pcc_ss_data->platform_owns_pcc) return 0; @@ -258,7 +257,7 @@ static int send_pcc_cmd(int pcc_ss_id, u16 cmd) int ret = -EIO, i; struct cppc_pcc_data *pcc_ss_data = pcc_data[pcc_ss_id]; struct acpi_pcct_shared_memory __iomem *generic_comm_base = - pcc_ss_data->pcc_comm_addr; + pcc_ss_data->pcc_channel->shmem; unsigned int time_delta; /* @@ -571,15 +570,6 @@ static int register_pcc_channel(int pcc_ss_idx) pcc_data[pcc_ss_idx]->pcc_mpar = pcc_chan->max_access_rate; pcc_data[pcc_ss_idx]->pcc_nominal = pcc_chan->latency; - pcc_data[pcc_ss_idx]->pcc_comm_addr = - acpi_os_ioremap(pcc_chan->shmem_base_addr, - pcc_chan->shmem_size); - if (!pcc_data[pcc_ss_idx]->pcc_comm_addr) { - pr_err("Failed to ioremap PCC comm region mem for %d\n", - pcc_ss_idx); - return -ENOMEM; - } - /* Set flag so that we don't come here for each CPU. */ pcc_data[pcc_ss_idx]->pcc_channel_acquired = true; }