From: Greg Kroah-Hartman Date: Thu, 9 Jan 2025 11:41:52 +0000 (+0100) Subject: 6.6-stable patches X-Git-Tag: v5.4.289~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4c2068af3db97a83dc3469bb729e5585abfa6c0;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-stable patches added patches: i2c-xgene-slimpro-migrate-to-use-generic-pcc-shmem-related-macros.patch --- diff --git a/queue-6.6/i2c-xgene-slimpro-migrate-to-use-generic-pcc-shmem-related-macros.patch b/queue-6.6/i2c-xgene-slimpro-migrate-to-use-generic-pcc-shmem-related-macros.patch new file mode 100644 index 00000000000..31a47314f0a --- /dev/null +++ b/queue-6.6/i2c-xgene-slimpro-migrate-to-use-generic-pcc-shmem-related-macros.patch @@ -0,0 +1,66 @@ +From 89a4ad1f437c049534891c3d83cd96d7c7debd2a Mon Sep 17 00:00:00 2001 +From: Sudeep Holla +Date: Wed, 27 Sep 2023 17:26:11 +0100 +Subject: i2c: xgene-slimpro: Migrate to use generic PCC shmem related macros + +From: Sudeep Holla + +commit 89a4ad1f437c049534891c3d83cd96d7c7debd2a upstream. + +Use the newly defined common and generic PCC shared memory region +related macros in this driver to replace the locally defined ones. + +Reviewed-by: Andi Shyti +Acked-by: Wolfram Sang +Link: https://lore.kernel.org/r/20230927-pcc_defines-v2-2-0b8ffeaef2e5@arm.com +Signed-off-by: Sudeep Holla +Stable-dep-of: 7f9e19f207be ("mailbox: pcc: Check before sending MCTP PCC response ACK") +Signed-off-by: Greg Kroah-Hartman +--- + drivers/i2c/busses/i2c-xgene-slimpro.c | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +--- a/drivers/i2c/busses/i2c-xgene-slimpro.c ++++ b/drivers/i2c/busses/i2c-xgene-slimpro.c +@@ -91,14 +91,6 @@ + + #define SLIMPRO_IIC_MSG_DWORD_COUNT 3 + +-/* PCC related defines */ +-#define PCC_SIGNATURE 0x50424300 +-#define PCC_STS_CMD_COMPLETE BIT(0) +-#define PCC_STS_SCI_DOORBELL BIT(1) +-#define PCC_STS_ERR BIT(2) +-#define PCC_STS_PLAT_NOTIFY BIT(3) +-#define PCC_CMD_GENERATE_DB_INT BIT(15) +- + struct slimpro_i2c_dev { + struct i2c_adapter adapter; + struct device *dev; +@@ -160,11 +152,11 @@ static void slimpro_i2c_pcc_rx_cb(struct + + /* Check if platform sends interrupt */ + if (!xgene_word_tst_and_clr(&generic_comm_base->status, +- PCC_STS_SCI_DOORBELL)) ++ PCC_STATUS_SCI_DOORBELL)) + return; + + if (xgene_word_tst_and_clr(&generic_comm_base->status, +- PCC_STS_CMD_COMPLETE)) { ++ PCC_STATUS_CMD_COMPLETE)) { + msg = generic_comm_base + 1; + + /* Response message msg[1] contains the return value. */ +@@ -186,10 +178,10 @@ static void slimpro_i2c_pcc_tx_prepare(s + cpu_to_le32(PCC_SIGNATURE | ctx->mbox_idx)); + + WRITE_ONCE(generic_comm_base->command, +- cpu_to_le16(SLIMPRO_MSG_TYPE(msg[0]) | PCC_CMD_GENERATE_DB_INT)); ++ cpu_to_le16(SLIMPRO_MSG_TYPE(msg[0]) | PCC_CMD_GENERATE_DB_INTR)); + + status = le16_to_cpu(READ_ONCE(generic_comm_base->status)); +- status &= ~PCC_STS_CMD_COMPLETE; ++ status &= ~PCC_STATUS_CMD_COMPLETE; + WRITE_ONCE(generic_comm_base->status, cpu_to_le16(status)); + + /* Copy the message to the PCC comm space */ diff --git a/queue-6.6/series b/queue-6.6/series index d4fcfe87ea9..f35fa61a5f7 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -44,6 +44,7 @@ clk-qcom-clk-alpha-pll-add-support-for-zonda-ole-pll.patch clk-qcom-clk-alpha-pll-add-nss-huayra-alpha-pll-supp.patch mailbox-pcc-add-support-for-platform-notification-ha.patch mailbox-pcc-support-shared-interrupt-for-multiple-su.patch +i2c-xgene-slimpro-migrate-to-use-generic-pcc-shmem-related-macros.patch acpi-pcc-add-pcc-shared-memory-region-command-and-st.patch mailbox-pcc-check-before-sending-mctp-pcc-response-a.patch remoteproc-qcom-pas-add-sc7180-adsp.patch