From: Eddie James <eajames@linux.ibm.com>
To: linux-aspeed@lists.ozlabs.org
Cc: eajames@linux.ibm.com, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-fsi@lists.ozlabs.org,
linux-spi@vger.kernel.org, linux-i2c@vger.kernel.org,
lakshmiy@us.ibm.com, robh@kernel.org, krzk+dt@kernel.org,
conor+dt@kernel.org, joel@jms.id.au, andrew@codeconstruct.com.au,
andi.shyti@kernel.org
Subject: [PATCH v4 15/17] fsi: occ: Get device number from FSI minor number API
Date: Mon, 29 Apr 2024 16:01:29 -0500 [thread overview]
Message-ID: <20240429210131.373487-16-eajames@linux.ibm.com> (raw)
In-Reply-To: <20240429210131.373487-1-eajames@linux.ibm.com>
Remove the IDA indexing for OCC devices and instead use the FSI
minor number API. This will make the OCC numbering consistent
with other FSI engines and make the "reg" device tree property
unnecessary.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
drivers/fsi/fsi-occ.c | 47 +++++++++----------------------------------
1 file changed, 9 insertions(+), 38 deletions(-)
diff --git a/drivers/fsi/fsi-occ.c b/drivers/fsi/fsi-occ.c
index da35ca9e84a6..2023355b3980 100644
--- a/drivers/fsi/fsi-occ.c
+++ b/drivers/fsi/fsi-occ.c
@@ -4,9 +4,9 @@
#include <linux/err.h>
#include <linux/errno.h>
#include <linux/fs.h>
+#include <linux/fsi.h>
#include <linux/fsi-sbefifo.h>
#include <linux/gfp.h>
-#include <linux/idr.h>
#include <linux/kernel.h>
#include <linux/list.h>
#include <linux/miscdevice.h>
@@ -44,6 +44,7 @@ struct occ {
struct device *sbefifo;
char name[32];
int idx;
+ dev_t devt;
bool platform_hwmon;
u8 sequence_number;
void *buffer;
@@ -75,8 +76,6 @@ struct occ_client {
#define to_client(x) container_of((x), struct occ_client, xfr)
-static DEFINE_IDA(occ_ida);
-
static int occ_open(struct inode *inode, struct file *file)
{
struct occ_client *client = kzalloc(sizeof(*client), GFP_KERNEL);
@@ -622,7 +621,6 @@ static int occ_unregister_of_child(struct device *dev, void *data)
static int occ_probe(struct platform_device *pdev)
{
int rc;
- u32 reg;
char child_name[32];
struct occ *occ;
struct platform_device *hwmon_dev = NULL;
@@ -637,6 +635,10 @@ static int occ_probe(struct platform_device *pdev)
if (!occ)
return -ENOMEM;
+ rc = fsi_get_new_minor(to_fsi_dev(dev->parent), fsi_dev_occ, &occ->devt, &occ->idx);
+ if (rc)
+ return rc;
+
/* SBE words are always four bytes */
occ->buffer = kvmalloc(OCC_MAX_RESP_WORDS * 4, GFP_KERNEL);
if (!occ->buffer)
@@ -651,24 +653,6 @@ static int occ_probe(struct platform_device *pdev)
*/
occ->sequence_number = (u8)((jiffies % 0xff) + 1);
mutex_init(&occ->occ_lock);
-
- if (dev->of_node) {
- rc = of_property_read_u32(dev->of_node, "reg", ®);
- if (!rc) {
- /* make sure we don't have a duplicate from dts */
- occ->idx = ida_simple_get(&occ_ida, reg, reg + 1,
- GFP_KERNEL);
- if (occ->idx < 0)
- occ->idx = ida_simple_get(&occ_ida, 1, INT_MAX,
- GFP_KERNEL);
- } else {
- occ->idx = ida_simple_get(&occ_ida, 1, INT_MAX,
- GFP_KERNEL);
- }
- } else {
- occ->idx = ida_simple_get(&occ_ida, 1, INT_MAX, GFP_KERNEL);
- }
-
platform_set_drvdata(pdev, occ);
snprintf(occ->name, sizeof(occ->name), "occ%d", occ->idx);
@@ -680,7 +664,7 @@ static int occ_probe(struct platform_device *pdev)
rc = misc_register(&occ->mdev);
if (rc) {
dev_err(dev, "failed to register miscdevice: %d\n", rc);
- ida_simple_remove(&occ_ida, occ->idx);
+ fsi_free_minor(occ->devt);
kvfree(occ->buffer);
return rc;
}
@@ -719,7 +703,7 @@ static int occ_remove(struct platform_device *pdev)
else
device_for_each_child(&pdev->dev, NULL, occ_unregister_of_child);
- ida_simple_remove(&occ_ida, occ->idx);
+ fsi_free_minor(occ->devt);
return 0;
}
@@ -746,20 +730,7 @@ static struct platform_driver occ_driver = {
.remove = occ_remove,
};
-static int occ_init(void)
-{
- return platform_driver_register(&occ_driver);
-}
-
-static void occ_exit(void)
-{
- platform_driver_unregister(&occ_driver);
-
- ida_destroy(&occ_ida);
-}
-
-module_init(occ_init);
-module_exit(occ_exit);
+module_platform_driver(occ_driver);
MODULE_AUTHOR("Eddie James <eajames@linux.ibm.com>");
MODULE_DESCRIPTION("BMC P9 OCC driver");
--
2.39.3
next prev parent reply other threads:[~2024-04-29 21:02 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-29 21:01 [PATCH v4 00/17] ARM: dts: aspeed: Add IBM P11 BMC Boards Eddie James
2024-04-29 21:01 ` [PATCH v4 01/17] spi: dt-bindings: Document the IBM FSI-attached SPI controller Eddie James
2024-04-30 6:50 ` Krzysztof Kozlowski
2024-04-29 21:01 ` [PATCH v4 02/17] dt-bindings: fsi: fsi2spi: Document SPI controller child nodes Eddie James
2024-04-30 6:51 ` Krzysztof Kozlowski
2024-04-29 21:01 ` [PATCH v4 03/17] dt-bindings: fsi: Document the IBM SCOM engine Eddie James
2024-04-29 21:01 ` [PATCH v4 04/17] dt-bindings: fsi: p9-occ: Convert to json-schema Eddie James
2024-04-30 6:53 ` Krzysztof Kozlowski
2024-05-01 15:59 ` Eddie James
2024-05-04 11:50 ` Krzysztof Kozlowski
2024-04-29 21:01 ` [PATCH v4 05/17] dt-bindings: fsi: Document the IBM SBEFIFO engine Eddie James
2024-04-30 6:54 ` Krzysztof Kozlowski
2024-05-01 16:03 ` Eddie James
2024-04-29 21:01 ` [PATCH v4 06/17] dt-bindings: fsi: Document the FSI controller common properties Eddie James
2024-04-30 7:01 ` Krzysztof Kozlowski
2024-05-01 16:06 ` Eddie James
2024-04-29 21:01 ` [PATCH v4 07/17] dt-bindings: fsi: ibm,i2cr-fsi-master: Reference common FSI controller Eddie James
2024-04-30 7:02 ` Krzysztof Kozlowski
2024-04-29 21:01 ` [PATCH v4 08/17] dt-bindings: fsi: ast2600-fsi-master: Convert to json-schema Eddie James
2024-04-30 7:04 ` Krzysztof Kozlowski
2024-05-01 16:12 ` Eddie James
2024-05-04 11:55 ` Krzysztof Kozlowski
2024-05-14 15:38 ` Eddie James
2024-04-29 21:01 ` [PATCH v4 09/17] dt-bindings: fsi: Document the FSI Hub Controller Eddie James
2024-04-30 7:31 ` Krzysztof Kozlowski
2024-04-29 21:01 ` [PATCH v4 10/17] dt-bindings: i2c: i2c-fsi: Convert to json-schema Eddie James
2024-04-30 7:35 ` Krzysztof Kozlowski
2024-05-01 16:16 ` Eddie James
2024-05-02 12:58 ` Krzysztof Kozlowski
2024-04-29 21:01 ` [PATCH v4 11/17] dt-bindings: arm: aspeed: add IBM P11 BMC boards Eddie James
2024-04-30 7:35 ` Krzysztof Kozlowski
2024-04-29 21:01 ` [PATCH v4 12/17] ARM: dts: aspeed: Add IBM P11 FSI devices Eddie James
2024-04-29 21:01 ` [PATCH v4 13/17] ARM: dts: aspeed: Add IBM P11 Blueridge BMC system Eddie James
2024-04-29 21:01 ` [PATCH v4 14/17] ARM: dts: aspeed: Add IBM P11 Fuji " Eddie James
2024-04-29 21:01 ` Eddie James [this message]
2024-04-29 21:01 ` [PATCH v4 16/17] fsi: occ: Find next available child rather than node name match Eddie James
2024-04-29 21:01 ` [PATCH v4 17/17] fsi: scom: Update compatible string to match documentation Eddie James
2024-04-30 7:37 ` Krzysztof Kozlowski
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=20240429210131.373487-16-eajames@linux.ibm.com \
--to=eajames@linux.ibm.com \
--cc=andi.shyti@kernel.org \
--cc=andrew@codeconstruct.com.au \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=joel@jms.id.au \
--cc=krzk+dt@kernel.org \
--cc=lakshmiy@us.ibm.com \
--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 \
--cc=robh@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).