{"id":1936146,"url":"http://patchwork.ozlabs.org/api/patches/1936146/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-aspeed/patch/20240516181907.3468796-35-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-35-eajames@linux.ibm.com>","list_archive_url":null,"date":"2024-05-16T18:19:01","name":"[v3,34/40] fsi: core: Add master register read-only sysfs","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"69b0e28a343d1c39c0f1b6677d6016fd68250478","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-35-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/1936146/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1936146/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=LhU9fWt0;\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=LhU9fWt0;\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=LhU9fWt0;\n\tdkim-atps=neutral","lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com\n (client-ip=148.163.156.1; helo=mx0a-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 4VgJM42jyXz1yfq\n\tfor ; Fri, 17 May 2024 04:21:20 +1000 (AEST)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4VgJM40Z0Cz3fpY\n\tfor ; Fri, 17 May 2024 04:21:20 +1000 (AEST)","from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com\n [148.163.156.1])\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 4VgJJz5QV5z3frq;\n\tFri, 17 May 2024 04:19:31 +1000 (AEST)","from pps.filterd (m0353727.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id\n 44GGlSQp023873;\n\tThu, 16 May 2024 18:19:22 GMT","from ppma13.dal12v.mail.ibm.com\n (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221])\n\tby mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3y5nycr8dd-1\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n\tThu, 16 May 2024 18:19:21 +0000","from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1])\n\tby ppma13.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id\n 44GGLm1D029592;\n\tThu, 16 May 2024 18:19:20 GMT","from smtprelay01.wdc07v.mail.ibm.com ([172.16.1.68])\n\tby ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3y2n7m34mg-1\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n\tThu, 16 May 2024 18:19:20 +0000","from smtpav05.dal12v.mail.ibm.com (smtpav05.dal12v.mail.ibm.com\n [10.241.53.104])\n\tby smtprelay01.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n 44GIJHj544630574\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n\tThu, 16 May 2024 18:19:20 GMT","from smtpav05.dal12v.mail.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id ACB5F58073;\n\tThu, 16 May 2024 18:19:17 +0000 (GMT)","from smtpav05.dal12v.mail.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 6E88558071;\n\tThu, 16 May 2024 18:19:17 +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:17 +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=QqPznRA+hyrwCZS4ZfTG52d1Xiq+sQbDIgM9Bqyai5Y=;\n b=LhU9fWt0LpKoW8pPwxfeIfyglZguAk8Z7FHvi7bBFT/Kwq84BG0IKhelkxfUQV/kMpQP\n u6F0P4ZuIbGfPmWcNtxVcGr1Nog0LjLgQ1u/JePRcnBt4Bj1sa022dAxaUHVztSpufF3\n rm7iI+RdFiqgOZDJOEPnkxSijfqIxbMmnxHVp39bJhFkHkaBj+EpXvlEjkI9cXMf/c3c\n wQXFPggva5HT8gnnyEAQlEl0MnAYDVyhZ3mvkPspWocE5aIY9kj/diC0EJBD3U4ChrAb\n TD10fluuqQ25PKEkAgGA3fMlVBz61o5mp1Zq7tX1NszLbp4tOU3jxGSTaheDHnhZsaCY OQ==","From":"Eddie James ","To":"linux-fsi@lists.ozlabs.org","Subject":"[PATCH v3 34/40] fsi: core: Add master register read-only sysfs","Date":"Thu, 16 May 2024 13:19:01 -0500","Message-Id":"<20240516181907.3468796-35-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":"pR0lzxHYKRZTL71aAOXDWwxAvFP9QeCG","X-Proofpoint-ORIG-GUID":"pR0lzxHYKRZTL71aAOXDWwxAvFP9QeCG","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 clxscore=1015 bulkscore=0\n malwarescore=0 priorityscore=1501 mlxscore=0 phishscore=0 suspectscore=0\n mlxlogscore=999 adultscore=0 lowpriorityscore=0 impostorscore=0\n spamscore=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":"The master registers are commonly used for debugging or diagnosis so\nprovide them in sysfs files.\n\nSigned-off-by: Eddie James \n---\n drivers/fsi/fsi-core.c | 144 +++++++++++++++++++++++++++++++++++++++\n drivers/fsi/fsi-master.h | 6 ++\n 2 files changed, 150 insertions(+)","diff":"diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c\nindex ae65d87d4b13e..096b26c6421f2 100644\n--- a/drivers/fsi/fsi-core.c\n+++ b/drivers/fsi/fsi-core.c\n@@ -1392,6 +1392,141 @@ static ssize_t master_break_store(struct device *dev,\n \n static DEVICE_ATTR(break, 0200, NULL, master_break_store);\n \n+struct fsi_master_attribute {\n+\tstruct device_attribute attr;\n+\tint reg;\n+};\n+\n+static ssize_t master_reg_show(struct device *dev, struct device_attribute *attr, char *buf)\n+{\n+\tstruct fsi_master_attribute *fattr = container_of(attr, struct fsi_master_attribute, attr);\n+\tstruct fsi_master *master = to_fsi_master(dev);\n+\tunsigned int reg;\n+\tint rc;\n+\t\n+\trc = regmap_read(master->map, fattr->reg, ®);\n+\tif (rc)\n+\t\treturn rc;\n+\n+\treturn sysfs_emit(buf, \"%08x\\n\", reg);\n+}\n+\n+static ssize_t master_reg_1bpp_show(struct device *dev, struct device_attribute *attr, char *buf)\n+{\n+\tstruct fsi_master_attribute *fattr = container_of(attr, struct fsi_master_attribute, attr);\n+\tstruct fsi_master *master = to_fsi_master(dev);\n+\tunsigned int count = (master->n_links + 31) / 32;\n+\tunsigned int reg;\n+\tunsigned int i;\n+\tint len = 0;\n+\tint rc;\n+\t\n+\tfor (i = 0; i < count; ++i) {\n+\t\trc = regmap_read(master->map, fattr->reg + (i * 4), ®);\n+\t\tif (rc)\n+\t\t\treturn rc;\n+\n+\t\tlen += sysfs_emit_at(buf, len, \"%08x\\n\", reg);\n+\t}\n+\n+\treturn len;\n+}\n+\n+static ssize_t master_reg_4bpp_show(struct device *dev, struct device_attribute *attr, char *buf)\n+{\n+\tstruct fsi_master_attribute *fattr = container_of(attr, struct fsi_master_attribute, attr);\n+\tstruct fsi_master *master = to_fsi_master(dev);\n+\tunsigned int count = (master->n_links + 7) / 8;\n+\tunsigned int reg;\n+\tunsigned int i;\n+\tint len = 0;\n+\tint rc;\n+\t\n+\tfor (i = 0; i < count; ++i) {\n+\t\trc = regmap_read(master->map, fattr->reg + (i * 4), ®);\n+\t\tif (rc)\n+\t\t\treturn rc;\n+\n+\t\tlen += sysfs_emit_at(buf, len, \"%08x\\n\", reg);\n+\t}\n+\n+\treturn len;\n+}\n+\n+static ssize_t master_reg_32bpp_show(struct device *dev, struct device_attribute *attr, char *buf)\n+{\n+\tstruct fsi_master_attribute *fattr = container_of(attr, struct fsi_master_attribute, attr);\n+\tstruct fsi_master *master = to_fsi_master(dev);\n+\tunsigned int reg;\n+\tint len = 0;\n+\tint rc;\n+\tint i;\n+\t\n+\tfor (i = 0; i < master->n_links; ++i) {\n+\t\trc = regmap_read(master->map, fattr->reg + (i * 4), ®);\n+\t\tif (rc)\n+\t\t\treturn rc;\n+\n+\t\tlen += sysfs_emit_at(buf, len, \"%08x\\n\", reg);\n+\t}\n+\n+\treturn len;\n+}\n+\n+#define FSI_MASTER_ATTR(name, reg) \\\n+\tstruct fsi_master_attribute dev_attr_##name = { __ATTR(name, 0444, master_reg_show, NULL), reg }\n+#define FSI_MASTER_ATTR_1BPP(name, reg) \\\n+\tstruct fsi_master_attribute dev_attr_##name = { __ATTR(name, 0444, master_reg_1bpp_show, NULL), reg }\n+#define FSI_MASTER_ATTR_4BPP(name, reg) \\\n+\tstruct fsi_master_attribute dev_attr_##name = { __ATTR(name, 0444, master_reg_4bpp_show, NULL), reg }\n+#define FSI_MASTER_ATTR_32BPP(name, reg) \\\n+\tstruct fsi_master_attribute dev_attr_##name = { __ATTR(name, 0444, master_reg_32bpp_show, NULL), reg }\n+\n+static FSI_MASTER_ATTR(mmode, FSI_MMODE);\n+static FSI_MASTER_ATTR(mdlyr, FSI_MDLYR);\n+static FSI_MASTER_ATTR_1BPP(mcrsp, FSI_MCRSP);\n+static FSI_MASTER_ATTR_1BPP(menp, FSI_MENP0);\n+static FSI_MASTER_ATTR_1BPP(mlevp, FSI_MLEVP0);\n+static FSI_MASTER_ATTR_1BPP(mrefp, FSI_MREFP0);\n+static FSI_MASTER_ATTR_1BPP(mhpmp, FSI_MHPMP0);\n+static FSI_MASTER_ATTR_4BPP(msiep, FSI_MSIEP0);\n+static FSI_MASTER_ATTR_1BPP(maesp, FSI_MAESP0);\n+static FSI_MASTER_ATTR(maeb, FSI_MAEB);\n+static FSI_MASTER_ATTR(mver, FSI_MVER);\n+static FSI_MASTER_ATTR_1BPP(mbsyp, FSI_MBSYP0);\n+static FSI_MASTER_ATTR_32BPP(mstap, FSI_MSTAP0);\n+static FSI_MASTER_ATTR(mesrb, FSI_MESRB0);\n+static FSI_MASTER_ATTR(mscsb, FSI_MSCSB0);\n+static FSI_MASTER_ATTR(matrb, FSI_MATRB0);\n+static FSI_MASTER_ATTR(mdtrb, FSI_MDTRB0);\n+static FSI_MASTER_ATTR(mectrl, FSI_MECTRL);\n+\n+static struct attribute *master_mapped_attrs[] = {\n+\t&dev_attr_mmode.attr.attr,\n+\t&dev_attr_mdlyr.attr.attr,\n+\t&dev_attr_mcrsp.attr.attr,\n+\t&dev_attr_menp.attr.attr,\n+\t&dev_attr_mlevp.attr.attr,\n+\t&dev_attr_mrefp.attr.attr,\n+\t&dev_attr_mhpmp.attr.attr,\n+\t&dev_attr_msiep.attr.attr,\n+\t&dev_attr_maesp.attr.attr,\n+\t&dev_attr_maeb.attr.attr,\n+\t&dev_attr_mver.attr.attr,\n+\t&dev_attr_mbsyp.attr.attr,\n+\t&dev_attr_mstap.attr.attr,\n+\t&dev_attr_mesrb.attr.attr,\n+\t&dev_attr_mscsb.attr.attr,\n+\t&dev_attr_matrb.attr.attr,\n+\t&dev_attr_mdtrb.attr.attr,\n+\t&dev_attr_mectrl.attr.attr,\n+\tNULL\n+};\n+\n+static const struct attribute_group master_mapped_group = {\n+\t.attrs = master_mapped_attrs,\n+};\n+\n static struct attribute *master_attrs[] = {\n \t&dev_attr_break.attr,\n \t&dev_attr_rescan.attr,\n@@ -1665,6 +1800,12 @@ int fsi_master_register(struct fsi_master *master)\n \t}\n out:\n \tmutex_unlock(&master->scan_lock);\n+\n+\tif (!rc && master->map) {\n+\t\tif (!sysfs_create_group(&master->dev.kobj, &master_mapped_group))\n+\t\t\tmaster->groups = true;\n+\t}\n+\n \treturn rc;\n }\n EXPORT_SYMBOL_GPL(fsi_master_register);\n@@ -1675,6 +1816,9 @@ void fsi_master_unregister(struct fsi_master *master)\n \n \ttrace_fsi_master_unregister(master);\n \n+\tif (master->groups)\n+\t\tsysfs_remove_group(&master->dev.kobj, &master_mapped_group);\n+\n \tmutex_lock(&master->scan_lock);\n \tfsi_master_unscan(master);\n \tmaster->n_links = 0;\ndiff --git a/drivers/fsi/fsi-master.h b/drivers/fsi/fsi-master.h\nindex 2104902091e05..1fa101a477899 100644\n--- a/drivers/fsi/fsi-master.h\n+++ b/drivers/fsi/fsi-master.h\n@@ -12,6 +12,7 @@\n #include \n #include \n #include \n+#include \n \n /*\n * Master registers\n@@ -27,12 +28,16 @@\n #define FSI_MENP0\t\t0x10\t\t/* R/W: enable */\n #define FSI_MLEVP0\t\t0x18\t\t/* R: plug detect */\n #define FSI_MSENP0\t\t0x18\t\t/* S: Set enable */\n+#define FSI_MREFP0\t\t0x20\t\t/* R: Plug reference */\n #define FSI_MCENP0\t\t0x20\t\t/* C: Clear enable */\n+#define FSI_MHPMP0\t\t0x28\t\t/* R: Plug monitor */\n #define FSI_MSIEP0\t\t0x30\t\t/* R/W: interrupt enable */\n+#define FSI_MAESP0\t\t0x50\t\t/* R: Any error port */\n #define FSI_MSSIEP0\t\t0x50\t\t/* S: Set interrupt enable */\n #define FSI_MCSIEP0\t\t0x70\t\t/* C: Clear interrupt enable */\n #define FSI_MAEB\t\t0x70\t\t/* R: Error address */\n #define FSI_MVER\t\t0x74\t\t/* R: master version/type */\n+#define FSI_MBSYP0\t\t0x78\t\t/* R: Port busy */\n #define FSI_MSTAP0\t\t0xd0\t\t/* R: Port status */\n #define FSI_MRESP0\t\t0xd0\t\t/* W: Port reset */\n #define FSI_MESRB0\t\t0x1d0\t\t/* R: Master error status */\n@@ -151,6 +156,7 @@ struct fsi_master {\n \tint\t\t(*link_config)(struct fsi_master *, int link,\n \t\t\t\t u8 t_send_delay, u8 t_echo_delay);\n \tu8\t\tremote_interrupt_status;\n+\tbool\t\tgroups;\n };\n \n #define to_fsi_master(d) container_of(d, struct fsi_master, dev)\n","prefixes":["v3","34/40"]}