{"id":1936094,"url":"http://patchwork.ozlabs.org/api/patches/1936094/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-aspeed/patch/20240516181907.3468796-7-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-7-eajames@linux.ibm.com>","list_archive_url":null,"date":"2024-05-16T18:18:33","name":"[v3,06/40] fsi: core: Improve master read/write/error traces","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"fc1d250393dc607471c2b7d2ab720ff7e21f1f00","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-7-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/1936094/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1936094/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=FxGoWv0Y;\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=FxGoWv0Y;\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=FxGoWv0Y;\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 4VgJKC51yfz20KF\n\tfor ; Fri, 17 May 2024 04:19:43 +1000 (AEST)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4VgJKC1tFQz3fqc\n\tfor ; Fri, 17 May 2024 04:19:43 +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 4VgJJr4cj6z3fnV;\n\tFri, 17 May 2024 04:19:24 +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 44GGl7Po022376;\n\tThu, 16 May 2024 18:19:13 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 3y5nycr8d7-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 (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 44GFXZgi029599;\n\tThu, 16 May 2024 18:19:11 GMT","from smtprelay06.dal12v.mail.ibm.com ([172.16.1.8])\n\tby ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3y2n7m34kx-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 44GIJ9If28574388\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 6503B58087;\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 2500D58065;\n\tThu, 16 May 2024 18:19:09 +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:09 +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=5eeoXCbaU56E8ifND9k7gRXOpAZyJwysFP2rCDv7kG0=;\n b=FxGoWv0Y9wMBGc4p8nTH25aHPVJhrGdgY7nO/NpEAEcJncObclh2XbUBzZEkpr9+hZ3n\n GQ8YGqsjLekaqJiByMM08b4DZ+Sk0wMmjl0dHWwSuLaW1Vysw5YnNLThmwQmaPn5tyMb\n YUy3YTK4MIJZFUu87Q97WQmsGkmzdLGZyeDiCKJ2dIk5lGZw801fyNPc+/GUt85GGOVw\n nISNO1FyQuJXVwCJowOY7kpshJS6giUzzq+wP5l5F7jy39B8isL+c+TPKWlCFXdAaTIj\n FXyKFa2ZAXPzwrgR3pdS0Y6swpEQHkhtwUMJuBgiQ6z+l56iA8O4U0zDcWoIx/I0r+eb LA==","From":"Eddie James ","To":"linux-fsi@lists.ozlabs.org","Subject":"[PATCH v3 06/40] fsi: core: Improve master read/write/error traces","Date":"Thu, 16 May 2024 13:18:33 -0500","Message-Id":"<20240516181907.3468796-7-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":"7nyjdNlNVNj31MUGPHseawf0FtNyXecb","X-Proofpoint-ORIG-GUID":"7nyjdNlNVNj31MUGPHseawf0FtNyXecb","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=881 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":"Consolidate the master read and write traces into one trace and\nchange the result trace into an error trace for less spam.\n\nSigned-off-by: Eddie James \n---\n drivers/fsi/fsi-core.c | 26 +++++----\n include/trace/events/fsi.h | 112 ++++++++++++-------------------------\n 2 files changed, 51 insertions(+), 87 deletions(-)","diff":"diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c\nindex 44875f2350b04..b3029f9c05e4a 100644\n--- a/drivers/fsi/fsi-core.c\n+++ b/drivers/fsi/fsi-core.c\n@@ -1116,14 +1116,15 @@ static int fsi_master_read(struct fsi_master *master, int link,\n {\n \tint rc;\n \n-\ttrace_fsi_master_read(master, link, slave_id, addr, size);\n-\n \trc = fsi_check_access(addr, size);\n-\tif (!rc)\n+\tif (!rc) {\n \t\trc = master->read(master, link, slave_id, addr, val, size);\n-\n-\ttrace_fsi_master_rw_result(master, link, slave_id, addr, size,\n-\t\t\tfalse, val, rc);\n+\t\tif (rc)\n+\t\t\ttrace_fsi_master_error(master->idx, link, slave_id, addr, size, val, rc,\n+\t\t\t\t\t true);\n+\t\telse\n+\t\t\ttrace_fsi_master_xfer(master->idx, link, slave_id, addr, size, val, true);\n+\t}\n \n \treturn rc;\n }\n@@ -1133,14 +1134,15 @@ static int fsi_master_write(struct fsi_master *master, int link,\n {\n \tint rc;\n \n-\ttrace_fsi_master_write(master, link, slave_id, addr, size, val);\n-\n \trc = fsi_check_access(addr, size);\n-\tif (!rc)\n+\tif (!rc) {\n \t\trc = master->write(master, link, slave_id, addr, val, size);\n-\n-\ttrace_fsi_master_rw_result(master, link, slave_id, addr, size,\n-\t\t\ttrue, val, rc);\n+\t\tif (rc)\n+\t\t\ttrace_fsi_master_error(master->idx, link, slave_id, addr, size, val, rc,\n+\t\t\t\t\t false);\n+\t\telse\n+\t\t\ttrace_fsi_master_xfer(master->idx, link, slave_id, addr, size, val, false);\n+\t}\n \n \treturn rc;\n }\ndiff --git a/include/trace/events/fsi.h b/include/trace/events/fsi.h\nindex 5ff15126ad9d5..fed8835f438e5 100644\n--- a/include/trace/events/fsi.h\n+++ b/include/trace/events/fsi.h\n@@ -8,101 +8,63 @@\n \n #include \n \n-TRACE_EVENT(fsi_master_read,\n-\tTP_PROTO(const struct fsi_master *master, int link, int id,\n-\t\t\tuint32_t addr, size_t size),\n-\tTP_ARGS(master, link, id, addr, size),\n+TRACE_EVENT(fsi_master_xfer,\n+\tTP_PROTO(int master_idx, int link, int id, uint32_t addr, size_t size, const void *data,\n+\t\t bool read),\n+\tTP_ARGS(master_idx, link, id, addr, size, data, read),\n \tTP_STRUCT__entry(\n-\t\t__field(int,\tmaster_idx)\n-\t\t__field(int,\tlink)\n-\t\t__field(int,\tid)\n-\t\t__field(__u32,\taddr)\n-\t\t__field(size_t,\tsize)\n+\t\t__field(int, master_idx)\n+\t\t__field(int, link)\n+\t\t__field(int, id)\n+\t\t__field(uint32_t, addr)\n+\t\t__field(int, size)\n+\t\t__field(uint32_t, data)\n+\t\t__field(bool, read)\n \t),\n \tTP_fast_assign(\n-\t\t__entry->master_idx = master->idx;\n+\t\t__entry->master_idx = master_idx;\n \t\t__entry->link = link;\n \t\t__entry->id = id;\n \t\t__entry->addr = addr;\n-\t\t__entry->size = size;\n-\t),\n-\tTP_printk(\"fsi%d:%02d:%02d %08x[%zu]\",\n-\t\t__entry->master_idx,\n-\t\t__entry->link,\n-\t\t__entry->id,\n-\t\t__entry->addr,\n-\t\t__entry->size\n-\t)\n-);\n-\n-TRACE_EVENT(fsi_master_write,\n-\tTP_PROTO(const struct fsi_master *master, int link, int id,\n-\t\t\tuint32_t addr, size_t size, const void *data),\n-\tTP_ARGS(master, link, id, addr, size, data),\n-\tTP_STRUCT__entry(\n-\t\t__field(int,\tmaster_idx)\n-\t\t__field(int,\tlink)\n-\t\t__field(int,\tid)\n-\t\t__field(__u32,\taddr)\n-\t\t__field(size_t,\tsize)\n-\t\t__field(__u32,\tdata)\n-\t),\n-\tTP_fast_assign(\n-\t\t__entry->master_idx = master->idx;\n-\t\t__entry->link = link;\n-\t\t__entry->id = id;\n-\t\t__entry->addr = addr;\n-\t\t__entry->size = size;\n+\t\t__entry->size = (int)size;\n \t\t__entry->data = 0;\n \t\tmemcpy(&__entry->data, data, size);\n+\t\t__entry->read = read;\n \t),\n-\tTP_printk(\"fsi%d:%02d:%02d %08x[%zu] <= {%*ph}\",\n-\t\t__entry->master_idx,\n-\t\t__entry->link,\n-\t\t__entry->id,\n-\t\t__entry->addr,\n-\t\t__entry->size,\n-\t\t(int)__entry->size, &__entry->data\n-\t)\n+\tTP_printk(\"fsi%d:%02d:%02d %s %08x {%*ph}\", __entry->master_idx, __entry->link,\n+\t\t __entry->id, __entry->read ? \"read\" : \"write\", __entry->addr, __entry->size,\n+\t\t &__entry->data)\n );\n \n-TRACE_EVENT(fsi_master_rw_result,\n-\tTP_PROTO(const struct fsi_master *master, int link, int id,\n-\t\t\tuint32_t addr, size_t size,\n-\t\t\tbool write, const void *data, int ret),\n-\tTP_ARGS(master, link, id, addr, size, write, data, ret),\n+TRACE_EVENT(fsi_master_error,\n+\tTP_PROTO(int master_idx, int link, int id, uint32_t addr, size_t size, const void *data,\n+\t\t int ret, bool read),\n+\tTP_ARGS(master_idx, link, id, addr, size, data, ret, read),\n \tTP_STRUCT__entry(\n-\t\t__field(int,\tmaster_idx)\n-\t\t__field(int,\tlink)\n-\t\t__field(int,\tid)\n-\t\t__field(__u32,\taddr)\n-\t\t__field(size_t,\tsize)\n-\t\t__field(bool,\twrite)\n-\t\t__field(__u32,\tdata)\n-\t\t__field(int,\tret)\n+\t\t__field(int, master_idx)\n+\t\t__field(int, link)\n+\t\t__field(int, id)\n+\t\t__field(uint32_t, addr)\n+\t\t__field(int, size)\n+\t\t__field(uint32_t, data)\n+\t\t__field(int, ret)\n+\t\t__field(bool, read)\n \t),\n \tTP_fast_assign(\n-\t\t__entry->master_idx = master->idx;\n+\t\t__entry->master_idx = master_idx;\n \t\t__entry->link = link;\n \t\t__entry->id = id;\n \t\t__entry->addr = addr;\n-\t\t__entry->size = size;\n-\t\t__entry->write = write;\n+\t\t__entry->size = (int)size;\n \t\t__entry->data = 0;\n-\t\t__entry->ret = ret;\n-\t\tif (__entry->write || !__entry->ret)\n+\t\tif (!read)\n \t\t\tmemcpy(&__entry->data, data, size);\n+\t\t__entry->ret = ret;\n+\t\t__entry->read = read;\n \t),\n-\tTP_printk(\"fsi%d:%02d:%02d %08x[%zu] %s {%*ph} ret %d\",\n-\t\t__entry->master_idx,\n-\t\t__entry->link,\n-\t\t__entry->id,\n-\t\t__entry->addr,\n-\t\t__entry->size,\n-\t\t__entry->write ? \"<=\" : \"=>\",\n-\t\t(int)__entry->size, &__entry->data,\n-\t\t__entry->ret\n-\t)\n+\tTP_printk(\"fsi%d:%02d:%02d %s %08x {%*ph} %d\", __entry->master_idx, __entry->link,\n+\t\t __entry->id, __entry->read ? \"read\" : \"write\", __entry->addr, __entry->size,\n+\t\t &__entry->data, __entry->ret)\n );\n \n TRACE_EVENT(fsi_master_break,\n","prefixes":["v3","06/40"]}