{"id":1936132,"url":"http://patchwork.ozlabs.org/api/patches/1936132/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-aspeed/patch/20240516181907.3468796-12-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-12-eajames@linux.ibm.com>","list_archive_url":null,"date":"2024-05-16T18:18:38","name":"[v3,11/40] fsi: core: Allow cfam device type aliases","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"dc688f4b40693ae0b2d9058895a2b222b6223f8c","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-12-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/1936132/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1936132/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=Ey1A+RcY;\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=Ey1A+RcY;\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=Ey1A+RcY;\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 4VgJLZ3p5wz1yfq\n\tfor ; Fri, 17 May 2024 04:20:54 +1000 (AEST)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4VgJLZ1cyBz3fnb\n\tfor ; Fri, 17 May 2024 04:20:54 +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 4VgJJx561Mz3fqV;\n\tFri, 17 May 2024 04:19:29 +1000 (AEST)","from pps.filterd (m0356516.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id\n 44GHgj1M003338;\n\tThu, 16 May 2024 18:19:16 GMT","from ppma21.wdc07v.mail.ibm.com\n (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91])\n\tby mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3y5pse82ht-1\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n\tThu, 16 May 2024 18:19:16 +0000","from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1])\n\tby ppma21.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id\n 44GIAFtU002257;\n\tThu, 16 May 2024 18:19:15 GMT","from smtprelay03.wdc07v.mail.ibm.com ([172.16.1.70])\n\tby ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3y2m0pkfug-1\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n\tThu, 16 May 2024 18:19:15 +0000","from smtpav05.dal12v.mail.ibm.com (smtpav05.dal12v.mail.ibm.com\n [10.241.53.104])\n\tby smtprelay03.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n 44GIJChx24052232\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n\tThu, 16 May 2024 18:19:15 GMT","from smtpav05.dal12v.mail.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id D18B75808B;\n\tThu, 16 May 2024 18:19:10 +0000 (GMT)","from smtpav05.dal12v.mail.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 9AF2D58072;\n\tThu, 16 May 2024 18:19:10 +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:10 +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=cejzBxtcEByI+xMESV4H8QqE4nNOLYSRaK7OFmvEFBE=;\n b=Ey1A+RcYq/mj91g9t8GMTZHiHVLGQ0UJvhWzQI7pD2gRfHD5jPy90uzffzYap+D5msJx\n W3SWH74GLFQRkEEDijAYSK25GkfqWnQFZlIpOsMgyOTHPYLbKDWdLIKHGz3ZAopbx/2p\n 5Daki9+KlDb5rtqPO650LYcMdjoOQhML4v5408QafgE8KDCOaGNmanBAUZe4pCESnCrm\n MeN/kCusiohclpoGP//XSyIV+4jDhaLNrLzpwnxjHkmj2SvVc851xaABW6GBLSx25USa\n 3ZySroFoBKLuBpdKHXPkXN3sPdstjZWmOb/6ghqUjfhUzLHokPtZPHr5XPoGjtIwf+FC nw==","From":"Eddie James ","To":"linux-fsi@lists.ozlabs.org","Subject":"[PATCH v3 11/40] fsi: core: Allow cfam device type aliases","Date":"Thu, 16 May 2024 13:18:38 -0500","Message-Id":"<20240516181907.3468796-12-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-ORIG-GUID":"12oT6ApGIe3bN8Ru7iVyyvIOj8pZQr2B","X-Proofpoint-GUID":"12oT6ApGIe3bN8Ru7iVyyvIOj8pZQr2B","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 bulkscore=0 adultscore=0\n suspectscore=0 lowpriorityscore=0 mlxscore=0 priorityscore=1501\n spamscore=0 impostorscore=0 phishscore=0 mlxlogscore=999 clxscore=1015\n malwarescore=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":"Other FSI devices can uses aliases for the device numbering, so\nmodify the function to get a new minor to allow the cfam type\nto use aliases too.\n\nSigned-off-by: Eddie James \n---\n drivers/fsi/fsi-core.c | 59 +++++++++++++++++++++---------------------\n 1 file changed, 29 insertions(+), 30 deletions(-)","diff":"diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c\nindex 660f89b743235..36e31eafad3d0 100644\n--- a/drivers/fsi/fsi-core.c\n+++ b/drivers/fsi/fsi-core.c\n@@ -884,12 +884,37 @@ static int fsi_adjust_index(int index)\n #endif\n }\n \n-static int __fsi_get_new_minor(struct fsi_slave *slave, enum fsi_dev_type type,\n-\t\t\t dev_t *out_dev, int *out_index)\n+static const char *const fsi_dev_type_names[] = {\n+\t\"cfam\",\n+\t\"sbefifo\",\n+\t\"scom\",\n+\t\"occ\",\n+};\n+\n+static int __fsi_get_new_minor(struct fsi_slave *slave, struct device_node *np,\n+\t\t\t enum fsi_dev_type type, dev_t *out_dev, int *out_index)\n {\n \tint cid = slave->chip_id;\n \tint id;\n \n+\tif (np && type < 4) {\n+\t\tint aid = of_alias_get_id(np, fsi_dev_type_names[type]);\n+\n+\t\tif (aid >= 0) {\n+\t\t\t/* Use the same scheme as the legacy numbers. */\n+\t\t\tid = (aid << 2) | type;\n+\t\t\tid = ida_alloc_range(&fsi_minor_ida, id, id, GFP_KERNEL);\n+\t\t\tif (id >= 0) {\n+\t\t\t\t*out_index = aid;\n+\t\t\t\t*out_dev = fsi_base_dev + id;\n+\t\t\t\treturn 0;\n+\t\t\t}\n+\n+\t\t\tif (id != -ENOSPC)\n+\t\t\t\treturn id;\n+\t\t}\n+\t}\n+\n \t/* Check if we qualify for legacy numbering */\n \tif (cid >= 0 && cid < 16 && type < 4) {\n \t\t/*\n@@ -918,36 +943,10 @@ static int __fsi_get_new_minor(struct fsi_slave *slave, enum fsi_dev_type type,\n \treturn 0;\n }\n \n-static const char *const fsi_dev_type_names[] = {\n-\t\"cfam\",\n-\t\"sbefifo\",\n-\t\"scom\",\n-\t\"occ\",\n-};\n-\n int fsi_get_new_minor(struct fsi_device *fdev, enum fsi_dev_type type,\n \t\t dev_t *out_dev, int *out_index)\n {\n-\tif (fdev->dev.of_node) {\n-\t\tint aid = of_alias_get_id(fdev->dev.of_node, fsi_dev_type_names[type]);\n-\n-\t\tif (aid >= 0) {\n-\t\t\t/* Use the same scheme as the legacy numbers. */\n-\t\t\tint id = (aid << 2) | type;\n-\n-\t\t\tid = ida_alloc_range(&fsi_minor_ida, id, id, GFP_KERNEL);\n-\t\t\tif (id >= 0) {\n-\t\t\t\t*out_index = aid;\n-\t\t\t\t*out_dev = fsi_base_dev + id;\n-\t\t\t\treturn 0;\n-\t\t\t}\n-\n-\t\t\tif (id != -ENOSPC)\n-\t\t\t\treturn id;\n-\t\t}\n-\t}\n-\n-\treturn __fsi_get_new_minor(fdev->slave, type, out_dev, out_index);\n+\treturn __fsi_get_new_minor(fdev->slave, fdev->dev.of_node, type, out_dev, out_index);\n }\n EXPORT_SYMBOL_GPL(fsi_get_new_minor);\n \n@@ -1059,7 +1058,7 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id)\n \t}\n \n \t/* Allocate a minor in the FSI space */\n-\trc = __fsi_get_new_minor(slave, fsi_dev_cfam, &slave->dev.devt,\n+\trc = __fsi_get_new_minor(slave, slave->dev.of_node, fsi_dev_cfam, &slave->dev.devt,\n \t\t\t\t &slave->cdev_idx);\n \tif (rc)\n \t\tgoto err_free;\n","prefixes":["v3","11/40"]}