{"id":1936117,"url":"http://patchwork.ozlabs.org/api/patches/1936117/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-aspeed/patch/20240516181907.3468796-6-eajames@linux.ibm.com/","project":{"id":57,"url":"http://patchwork.ozlabs.org/api/projects/57/?format=json","name":"Linux ASPEED SoC development","link_name":"linux-aspeed","list_id":"linux-aspeed.lists.ozlabs.org","list_email":"linux-aspeed@lists.ozlabs.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20240516181907.3468796-6-eajames@linux.ibm.com>","list_archive_url":null,"date":"2024-05-16T18:18:32","name":"[v3,05/40] fsi: Calculate local bus clock frequency","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"546d73631a329c06301b64d546ebe9a4d6fc67b3","submitter":{"id":74989,"url":"http://patchwork.ozlabs.org/api/people/74989/?format=json","name":"Eddie James","email":"eajames@linux.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-aspeed/patch/20240516181907.3468796-6-eajames@linux.ibm.com/mbox/","series":[{"id":407101,"url":"http://patchwork.ozlabs.org/api/series/407101/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-aspeed/list/?series=407101","date":"2024-05-16T18:18:31","name":"fsi: Add interrupt support","version":3,"mbox":"http://patchwork.ozlabs.org/series/407101/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1936117/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1936117/checks/","tags":{},"related":[],"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","linux-aspeed@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@legolas.ozlabs.org","linux-aspeed@lists.ozlabs.org"],"Authentication-Results":["legolas.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256\n header.s=pp1 header.b=pxEPVioM;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org;\n envelope-from=linux-aspeed-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org;\n receiver=patchwork.ozlabs.org)","lists.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256\n header.s=pp1 header.b=pxEPVioM;\n\tdkim-atps=neutral","lists.ozlabs.org;\n dmarc=pass (p=none dis=none) header.from=linux.ibm.com","lists.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256\n header.s=pp1 header.b=pxEPVioM;\n\tdkim-atps=neutral","lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com\n (client-ip=148.163.158.5; helo=mx0b-001b2d01.pphosted.com;\n envelope-from=eajames@linux.ibm.com; receiver=lists.ozlabs.org)"],"Received":["from lists.ozlabs.org (lists.ozlabs.org\n [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature ECDSA (secp384r1))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4VgJL10ss4z1yfq\n\tfor ; Fri, 17 May 2024 04:20:25 +1000 (AEST)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4VgJL05r0Fz3fqx\n\tfor ; Fri, 17 May 2024 04:20:24 +1000 (AEST)","from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com\n [148.163.158.5])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 4VgJJv1yXXz3fpX;\n\tFri, 17 May 2024 04:19:27 +1000 (AEST)","from pps.filterd (m0353723.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id\n 44GI9XIt019715;\n\tThu, 16 May 2024 18:19:13 GMT","from ppma12.dal12v.mail.ibm.com\n (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220])\n\tby mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3y5q5980mt-1\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n\tThu, 16 May 2024 18:19:12 +0000","from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1])\n\tby ppma12.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id\n 44GH0GoI018828;\n\tThu, 16 May 2024 18:19:11 GMT","from smtprelay06.dal12v.mail.ibm.com ([172.16.1.8])\n\tby ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 3y2k0tuqe1-1\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n\tThu, 16 May 2024 18:19:11 +0000","from smtpav05.dal12v.mail.ibm.com (smtpav05.dal12v.mail.ibm.com\n [10.241.53.104])\n\tby smtprelay06.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n 44GIJ9pw57409906\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n\tThu, 16 May 2024 18:19:11 GMT","from smtpav05.dal12v.mail.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 1CB8158084;\n\tThu, 16 May 2024 18:19:09 +0000 (GMT)","from smtpav05.dal12v.mail.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id D0E2B58088;\n\tThu, 16 May 2024 18:19:08 +0000 (GMT)","from slate16.aus.stglabs.ibm.com (unknown [9.61.107.19])\n\tby smtpav05.dal12v.mail.ibm.com (Postfix) with ESMTP;\n\tThu, 16 May 2024 18:19:08 +0000 (GMT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com;\n h=from : to : cc : subject\n : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding; s=pp1;\n bh=Wgrp9mSZpxfDhxFWWnfZxUxl4xHvgw/nBvDHfI2klKI=;\n b=pxEPVioMDRil1pCqVMq7lC6ZNfwhpvjkslzhWpMcZefyDcZDOFNOTlY3JxuXuZ0w9cE5\n eeggip1/PRNgeh4vS1FibfA2UNz8RUoVGpHT0bEWYrcWBgYQmvKdzB7op1yvUtuC/EYl\n DNB3cMKZvEu+RVjygJkhxFPBTKUJYyOZ55XXyB91Q98qIxCD/mKS06FmLirb59v7DRh4\n ika9Y10Vm/o8935PcalWKfSud240yep/1Jg84DBdx2D8GRSLrOAq8IXFbmDIclCOqXVK\n 25J/1afLdOKKiTO6zKMuFa1+x491p17u0w9ptYzajW+CQ3VLAWJbonjtEVESOKVo0HDy 7A==","From":"Eddie James ","To":"linux-fsi@lists.ozlabs.org","Subject":"[PATCH v3 05/40] fsi: Calculate local bus clock frequency","Date":"Thu, 16 May 2024 13:18:32 -0500","Message-Id":"<20240516181907.3468796-6-eajames@linux.ibm.com>","X-Mailer":"git-send-email 2.39.3","In-Reply-To":"<20240516181907.3468796-1-eajames@linux.ibm.com>","References":"<20240516181907.3468796-1-eajames@linux.ibm.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-TM-AS-GCONF":"00","X-Proofpoint-GUID":"Pe6chPvis694aZ-ghQ3j2i0LNtrROURo","X-Proofpoint-ORIG-GUID":"Pe6chPvis694aZ-ghQ3j2i0LNtrROURo","X-Proofpoint-Virus-Version":"vendor=baseguard\n engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26\n definitions=2024-05-16_07,2024-05-15_01,2023-05-22_02","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n impostorscore=0\n mlxlogscore=999 suspectscore=0 mlxscore=0 malwarescore=0 clxscore=1015\n priorityscore=1501 phishscore=0 bulkscore=0 lowpriorityscore=0 spamscore=0\n adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1\n engine=8.12.0-2405010000 definitions=main-2405160132","X-BeenThere":"linux-aspeed@lists.ozlabs.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"Linux ASPEED SoC development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Cc":"andi.shyti@kernel.org, linux-aspeed@lists.ozlabs.org, jk@ozlabs.org,\n alistair@popple.id.au, linux-kernel@vger.kernel.org,\n linux-spi@vger.kernel.org, broonie@kernel.org, andrew@codeconstruct.com.au,\n linux-i2c@vger.kernel.org","Errors-To":"linux-aspeed-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org","Sender":"\"Linux-aspeed\"\n "},"content":"Instead of a hardcoded local bus clock divider, calculate the responder\nlocal bus frequency from the FSI bus frequency. This will allow FSI\nengine drivers to set and calculate their bus (I2C, SPI, etc) frequencies.\n\nSigned-off-by: Eddie James \n---\nChanges since v2:\n - Use cfam clock-frequency property instead of hardcoded master local bus\n divider\n - Change default local bus clock divider from 8 to 2\n\n drivers/fsi/fsi-core.c | 22 +++++++++++++++++++---\n drivers/fsi/fsi-master.h | 1 +\n drivers/fsi/fsi-slave.h | 2 ++\n include/linux/fsi.h | 1 +\n 4 files changed, 23 insertions(+), 3 deletions(-)","diff":"diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c\nindex 27235583183e5..44875f2350b04 100644\n--- a/drivers/fsi/fsi-core.c\n+++ b/drivers/fsi/fsi-core.c\n@@ -109,6 +109,12 @@ int fsi_device_peek(struct fsi_device *dev, void *val)\n \treturn fsi_slave_read(dev->slave, addr, val, sizeof(uint32_t));\n }\n \n+unsigned long fsi_device_local_bus_frequency(struct fsi_device *dev)\n+{\n+\treturn dev->slave->master->clock_frequency / dev->slave->clock_div;\n+}\n+EXPORT_SYMBOL_GPL(fsi_device_local_bus_frequency);\n+\n static void fsi_device_release(struct device *_device)\n {\n \tstruct fsi_device *device = to_fsi_dev(_device);\n@@ -209,12 +215,12 @@ static inline uint32_t fsi_smode_sid(int x)\n \treturn (x & FSI_SMODE_SID_MASK) << FSI_SMODE_SID_SHIFT;\n }\n \n-static uint32_t fsi_slave_smode(int id, u8 t_senddly, u8 t_echodly)\n+static uint32_t fsi_slave_smode(int id, int div, u8 t_senddly, u8 t_echodly)\n {\n \treturn FSI_SMODE_WSC | FSI_SMODE_ECRC\n \t\t| fsi_smode_sid(id)\n \t\t| fsi_smode_echodly(t_echodly - 1) | fsi_smode_senddly(t_senddly - 1)\n-\t\t| fsi_smode_lbcrr(0x8);\n+\t\t| fsi_smode_lbcrr(div - 1);\n }\n \n static int fsi_slave_set_smode(struct fsi_slave *slave, uint8_t id)\n@@ -225,7 +231,8 @@ static int fsi_slave_set_smode(struct fsi_slave *slave, uint8_t id)\n \t/* set our smode register with the slave ID field to 0; this enables\n \t * extended slave addressing\n \t */\n-\tsmode = fsi_slave_smode(slave->id, slave->t_send_delay, slave->t_echo_delay);\n+\tsmode = fsi_slave_smode(slave->id, slave->clock_div, slave->t_send_delay,\n+\t\t\t\tslave->t_echo_delay);\n \tdata = cpu_to_be32(smode);\n \n \treturn fsi_master_write(slave->master, slave->link, id, FSI_SLAVE_BASE + FSI_SMODE,\n@@ -950,6 +957,7 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id)\n \tstruct fsi_slave *slave;\n \tuint8_t crc;\n \t__be32 data, llmode, slbus;\n+\tu32 clock;\n \tint rc;\n \n \t/* Currently, we only support single slaves on a link, and use the\n@@ -1003,6 +1011,7 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id)\n \tslave->dev.of_node = fsi_slave_find_of_node(master, link, id);\n \tslave->dev.release = fsi_slave_release;\n \tdevice_initialize(&slave->dev);\n+\tslave->clock_div = FSI_SMODE_LBCRR_DEFAULT;\n \tslave->cfam_id = cfam_id;\n \tslave->master = master;\n \tslave->link = link;\n@@ -1020,6 +1029,10 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id)\n \n \t}\n \n+\tif (master->clock_frequency && !device_property_read_u32(&slave->dev, \"clock-frequency\",\n+\t\t\t\t\t\t\t\t &clock) && clock)\n+\t\tslave->clock_div = DIV_ROUND_UP(master->clock_frequency, clock);\n+\n \tslbus = cpu_to_be32(FSI_SLBUS_FORCE);\n \trc = fsi_master_write(master, link, id, FSI_SLAVE_BASE + FSI_SLBUS,\n \t\t\t &slbus, sizeof(slbus));\n@@ -1289,6 +1302,9 @@ int fsi_master_register(struct fsi_master *master)\n \tif (!dev_name(&master->dev))\n \t\tdev_set_name(&master->dev, \"fsi%d\", master->idx);\n \n+\tif (master->flags & FSI_MASTER_FLAG_SWCLOCK)\n+\t\tmaster->clock_frequency = 100000000; // POWER reference clock\n+\n \tmaster->dev.class = &fsi_master_class;\n \n \tmutex_lock(&master->scan_lock);\ndiff --git a/drivers/fsi/fsi-master.h b/drivers/fsi/fsi-master.h\nindex a0d7ad0f0f7cc..ff23983ea84c8 100644\n--- a/drivers/fsi/fsi-master.h\n+++ b/drivers/fsi/fsi-master.h\n@@ -121,6 +121,7 @@\n \n struct fsi_master {\n \tstruct device\tdev;\n+\tunsigned long\tclock_frequency;\n \tint\t\tidx;\n \tint\t\tn_links;\n \tint\t\tflags;\ndiff --git a/drivers/fsi/fsi-slave.h b/drivers/fsi/fsi-slave.h\nindex 45190b06fa027..fabc0b66d5bf3 100644\n--- a/drivers/fsi/fsi-slave.h\n+++ b/drivers/fsi/fsi-slave.h\n@@ -48,6 +48,7 @@\n #define FSI_SMODE_SD_DEFAULT\t 16\t\t/* Default send delay */\n #define FSI_SMODE_LBCRR_SHIFT\t8\t\t/* Clk ratio shift */\n #define FSI_SMODE_LBCRR_MASK\t0xf\t\t/* Clk ratio mask */\n+#define FSI_SMODE_LBCRR_DEFAULT\t 2\t\t/* Default clk ratio */\n \n /*\n * SISS fields\n@@ -104,6 +105,7 @@ struct fsi_slave {\n \tint\t\t\tid;\t/* FSI address */\n \tint\t\t\tlink;\t/* FSI link# */\n \tu32\t\t\tcfam_id;\n+\tu32\t\t\tclock_div;\n \tint\t\t\tchip_id;\n \tuint32_t\t\tsize;\t/* size of slave address space */\n \tu8\t\t\tt_send_delay;\ndiff --git a/include/linux/fsi.h b/include/linux/fsi.h\nindex 3df8c54868df5..e0309bf0ae072 100644\n--- a/include/linux/fsi.h\n+++ b/include/linux/fsi.h\n@@ -24,6 +24,7 @@ extern int fsi_device_read(struct fsi_device *dev, uint32_t addr,\n extern int fsi_device_write(struct fsi_device *dev, uint32_t addr,\n \t\tconst void *val, size_t size);\n extern int fsi_device_peek(struct fsi_device *dev, void *val);\n+extern unsigned long fsi_device_local_bus_frequency(struct fsi_device *dev);\n \n struct fsi_device_id {\n \tu8\tengine_type;\n","prefixes":["v3","05/40"]}