From: Eddie James <eajames@linux.ibm.com>
To: linux-fsi@lists.ozlabs.org
Cc: linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org,
linux-spi@vger.kernel.org, broonie@kernel.org,
andi.shyti@kernel.org, joel@jms.id.au, alistair@popple.id.au,
jk@ozlabs.org, andrew@codeconstruct.com.au,
linux-aspeed@lists.ozlabs.org, eajames@linux.ibm.com
Subject: [PATCH v3 11/40] fsi: core: Allow cfam device type aliases
Date: Thu, 16 May 2024 13:18:38 -0500 [thread overview]
Message-ID: <20240516181907.3468796-12-eajames@linux.ibm.com> (raw)
In-Reply-To: <20240516181907.3468796-1-eajames@linux.ibm.com>
Other FSI devices can uses aliases for the device numbering, so
modify the function to get a new minor to allow the cfam type
to use aliases too.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
drivers/fsi/fsi-core.c | 59 +++++++++++++++++++++---------------------
1 file changed, 29 insertions(+), 30 deletions(-)
diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c
index 660f89b743235..36e31eafad3d0 100644
--- a/drivers/fsi/fsi-core.c
+++ b/drivers/fsi/fsi-core.c
@@ -884,12 +884,37 @@ static int fsi_adjust_index(int index)
#endif
}
-static int __fsi_get_new_minor(struct fsi_slave *slave, enum fsi_dev_type type,
- dev_t *out_dev, int *out_index)
+static const char *const fsi_dev_type_names[] = {
+ "cfam",
+ "sbefifo",
+ "scom",
+ "occ",
+};
+
+static int __fsi_get_new_minor(struct fsi_slave *slave, struct device_node *np,
+ enum fsi_dev_type type, dev_t *out_dev, int *out_index)
{
int cid = slave->chip_id;
int id;
+ if (np && type < 4) {
+ int aid = of_alias_get_id(np, fsi_dev_type_names[type]);
+
+ if (aid >= 0) {
+ /* Use the same scheme as the legacy numbers. */
+ id = (aid << 2) | type;
+ id = ida_alloc_range(&fsi_minor_ida, id, id, GFP_KERNEL);
+ if (id >= 0) {
+ *out_index = aid;
+ *out_dev = fsi_base_dev + id;
+ return 0;
+ }
+
+ if (id != -ENOSPC)
+ return id;
+ }
+ }
+
/* Check if we qualify for legacy numbering */
if (cid >= 0 && cid < 16 && type < 4) {
/*
@@ -918,36 +943,10 @@ static int __fsi_get_new_minor(struct fsi_slave *slave, enum fsi_dev_type type,
return 0;
}
-static const char *const fsi_dev_type_names[] = {
- "cfam",
- "sbefifo",
- "scom",
- "occ",
-};
-
int fsi_get_new_minor(struct fsi_device *fdev, enum fsi_dev_type type,
dev_t *out_dev, int *out_index)
{
- if (fdev->dev.of_node) {
- int aid = of_alias_get_id(fdev->dev.of_node, fsi_dev_type_names[type]);
-
- if (aid >= 0) {
- /* Use the same scheme as the legacy numbers. */
- int id = (aid << 2) | type;
-
- id = ida_alloc_range(&fsi_minor_ida, id, id, GFP_KERNEL);
- if (id >= 0) {
- *out_index = aid;
- *out_dev = fsi_base_dev + id;
- return 0;
- }
-
- if (id != -ENOSPC)
- return id;
- }
- }
-
- return __fsi_get_new_minor(fdev->slave, type, out_dev, out_index);
+ return __fsi_get_new_minor(fdev->slave, fdev->dev.of_node, type, out_dev, out_index);
}
EXPORT_SYMBOL_GPL(fsi_get_new_minor);
@@ -1059,7 +1058,7 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id)
}
/* Allocate a minor in the FSI space */
- rc = __fsi_get_new_minor(slave, fsi_dev_cfam, &slave->dev.devt,
+ rc = __fsi_get_new_minor(slave, slave->dev.of_node, fsi_dev_cfam, &slave->dev.devt,
&slave->cdev_idx);
if (rc)
goto err_free;
--
2.39.3
next prev parent reply other threads:[~2024-05-16 18:19 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-16 18:18 [PATCH v3 00/40] fsi: Add interrupt support Eddie James
2024-05-16 18:18 ` [PATCH v3 01/40] fsi: hub: Set master index to link number plus one Eddie James
2024-05-16 18:18 ` [PATCH v3 02/40] fsi: Move slave definitions to fsi-slave.h Eddie James
2024-05-16 18:18 ` [PATCH v3 03/40] fsi: Fix slave addressing after break command Eddie James
2024-05-16 18:18 ` [PATCH v3 04/40] fsi: Use a defined value for default echo delay Eddie James
2024-05-16 18:18 ` [PATCH v3 05/40] fsi: Calculate local bus clock frequency Eddie James
2024-05-16 18:18 ` [PATCH v3 06/40] fsi: core: Improve master read/write/error traces Eddie James
2024-05-16 18:18 ` [PATCH v3 07/40] fsi: core: Add slave error trace Eddie James
2024-05-16 18:18 ` [PATCH v3 08/40] fsi: core: Reset errors instead of clearing interrupts Eddie James
2024-05-16 18:18 ` [PATCH v3 09/40] fsi: aspeed: Add AST2700 support Eddie James
2024-05-16 18:18 ` [PATCH v3 10/40] fsi: core: Add slave spinlock Eddie James
2024-05-16 18:18 ` Eddie James [this message]
2024-05-16 18:18 ` [PATCH v3 12/40] fsi: core: Add common regmap master functions Eddie James
2024-05-16 18:18 ` [PATCH v3 13/40] fsi: core: Disable relative addressing during scan Eddie James
2024-05-16 18:18 ` [PATCH v3 14/40] fsi: hub: Use common initialization and link enable Eddie James
2024-05-16 18:18 ` [PATCH v3 15/40] fsi: aspeed: " Eddie James
2024-05-16 18:18 ` [PATCH v3 16/40] fsi: aspeed: Remove cfam reset sysfs file in error path and remove Eddie James
2024-05-16 18:18 ` [PATCH v3 17/40] fsi: aspeed: Refactor trace functions Eddie James
2024-05-16 18:18 ` [PATCH v3 18/40] fsi: aspeed: Don't clear all IRQs during OPB transfers Eddie James
2024-05-16 18:18 ` [PATCH v3 19/40] fsi: aspeed: Only read result register for successful read Eddie James
2024-05-16 18:18 ` [PATCH v3 20/40] fsi: aspeed: Switch to spinlock Eddie James
2024-05-16 18:18 ` [PATCH v3 21/40] fsi: aspeed: Disable relative addressing and IPOLL for cfam reset Eddie James
2024-05-16 18:18 ` [PATCH v3 22/40] fsi: aspeed: Use common master error handler Eddie James
2024-05-16 18:18 ` [PATCH v3 23/40] fsi: core: Add interrupt support Eddie James
2024-05-17 20:41 ` kernel test robot
2024-05-16 18:18 ` [PATCH v3 24/40] fsi: aspeed: " Eddie James
2024-05-16 18:18 ` [PATCH v3 25/40] fsi: hub: " Eddie James
2024-05-16 18:18 ` [PATCH v3 26/40] i2c: fsi: Calculate clock divider from local bus frequency Eddie James
2024-05-16 18:18 ` [PATCH v3 27/40] i2c: fsi: Improve formatting Eddie James
2024-05-16 18:18 ` [PATCH v3 28/40] i2c: fsi: Change fsi_i2c_write_reg to accept data instead of a pointer Eddie James
2024-05-16 18:18 ` [PATCH v3 29/40] i2c: fsi: Remove list structure of ports Eddie James
2024-05-16 18:18 ` [PATCH v3 30/40] i2c: fsi: Define a function to check status error bits Eddie James
2024-05-16 18:18 ` [PATCH v3 31/40] i2c: fsi: Add boolean for skip stop command on abort Eddie James
2024-05-16 18:18 ` [PATCH v3 32/40] i2c: fsi: Add interrupt support Eddie James
2024-05-16 18:19 ` [PATCH v3 33/40] fsi: hub master: Reset hub master after errors Eddie James
2024-05-16 18:19 ` [PATCH v3 34/40] fsi: core: Add master register read-only sysfs Eddie James
2024-05-16 18:19 ` [PATCH v3 35/40] fsi: core: Add slave " Eddie James
2024-05-16 18:19 ` [PATCH v3 36/40] fsi: i2cr: Adjust virtual CFAM ID to match Odyssey chip Eddie James
2024-05-16 18:19 ` [PATCH v3 37/40] fsi: core: Add different types of CFAM Eddie James
2024-05-17 12:38 ` kernel test robot
2024-05-17 15:49 ` kernel test robot
2024-05-18 1:03 ` kernel test robot
2024-05-16 18:19 ` [PATCH v3 38/40] spi: fsi: Calculate clock divider from local bus frequency Eddie James
2024-05-16 18:24 ` Mark Brown
2024-05-16 18:19 ` [PATCH v3 39/40] ARM: dts: aspeed: P10 and tacoma: Set FSI clock frequency Eddie James
2024-05-16 18:19 ` [PATCH v3 40/40] ARM: dts: aspeed: P10: Bump SPI max frequencies Eddie James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240516181907.3468796-12-eajames@linux.ibm.com \
--to=eajames@linux.ibm.com \
--cc=alistair@popple.id.au \
--cc=andi.shyti@kernel.org \
--cc=andrew@codeconstruct.com.au \
--cc=broonie@kernel.org \
--cc=jk@ozlabs.org \
--cc=joel@jms.id.au \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-fsi@lists.ozlabs.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).