Skip to contentSkip to conversation

fsi: core: Fix legacy minor numbering

PATCH In review Eddie James 2 participants 3 messages Apr 13, 2023 – Jun 8, 2023 FSI

lore
Share & tools
lore

Eddie James

author maintainer
#0 lore raw

PATCH 1/1 fsi: core: Fix legacy minor numbering

FSI reserves the first 64 minor numbers for the legacy numbering based on the chip id. However the legacy number shifts the chip id too much, resulting in overlap between legacy and non-legacy numbers. Reduce the chip id bit shift since the type field only takes 2 bits.

---
 drivers/fsi/fsi-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/fsi/fsi-core.c +1 -1
index 0b927c9f4267..b9f410170655 100644
@@ -950,7 +950,7 @@ static int __fsi_get_new_minor(struct fsi_slave *slave, enum fsi_dev_type type,
 	/* Check if we qualify for legacy numbering */
 	if (cid >= 0 && cid < 16 && type < 4) {
 		/* Try reserving the legacy number */
-		id = (cid << 4) | type;
+		id = (cid << 2) | type;
 		id = ida_simple_get(&fsi_minor_ida, id, id + 1, GFP_KERNEL);
 		if (id >= 0) {
 			*out_index = fsi_adjust_index(cid);
Signature · 1 line
2.31.1
#1 lore raw
Quoted 6 lines · Eddie James

FSI reserves the first 64 minor numbers for the legacy numbering based on the chip id. However the legacy number shifts the chip id too much, resulting in overlap between legacy and non-legacy numbers. Reduce the chip id bit shift since the type field only takes 2 bits.

I don't know much about the legacy numbering. Was that something we used before the device tree descriptions were in place? Do we still need it if we have updated device trees?

Quoted 11 lines
---
 drivers/fsi/fsi-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/fsi/fsi-core.c +0 -0
index 0b927c9f4267..b9f410170655 100644

drivers/fsi/fsi-core.c static int __fsi_get_new_minor(struct fsi_slave *slave, enum fsi_dev_type type, · line 952

Quoted 3 lines
drivers/fsi/fsi-core.c +0 -0
@@ -950,7 +950,7 @@ static int __fsi_get_new_minor(struct fsi_slave *slave, enum fsi_dev_type type,
        /* Check if we qualify for legacy numbering */
        if (cid >= 0 && cid < 16 && type < 4) {
                /* Try reserving the legacy number */

Would it help to put some of your commit message info in this comment, so we know what the magic shift is doing?

Quoted 8 lines
drivers/fsi/fsi-core.c +1 -2
-               id = (cid << 4) | type;
+               id = (cid << 2) | type;
                id = ida_simple_get(&fsi_minor_ida, id, id + 1, GFP_KERNEL);
                if (id >= 0) {
                        *out_index = fsi_adjust_index(cid);
--

2.31.1

author maintainer
#2 lore raw
Quoted 9 lines · Joel Stanley
Quoted 5 lines · Eddie James

FSI reserves the first 64 minor numbers for the legacy numbering based on the chip id. However the legacy number shifts the chip id too much, resulting in overlap between legacy and non-legacy numbers. Reduce the chip id bit shift since the type field only takes 2 bits.

I don't know much about the legacy numbering. Was that something we used before the device tree descriptions were in place? Do we still need it if we have updated device trees?

Its a way to number the devices based on the "chip id", which came from the device tree anyway. Now with the aliasing patch we could do away with it I believe, but we would need to update older system device trees (and scom devices on p10) to not break stuff.

Quoted 6 lines
Quoted 6 lines
---
  drivers/fsi/fsi-core.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 10 lines

drivers/fsi/fsi-core.c static int __fsi_get_new_minor(struct fsi_slave *slave, enum fsi_dev_type type, · line 952

Quoted 8 lines
drivers/fsi/fsi-core.c +0 -0
index 0b927c9f4267..b9f410170655 100644
@@ -950,7 +950,7 @@ static int __fsi_get_new_minor(struct fsi_slave *slave, enum fsi_dev_type type,
         /* Check if we qualify for legacy numbering */
         if (cid >= 0 && cid < 16 && type < 4) {
                 /* Try reserving the legacy number */

Would it help to put some of your commit message info in this comment, so we know what the magic shift is doing?

Sure thing.

Thanks,

Eddie

Quoted 9 lines
Quoted 9 lines
drivers/fsi/fsi-core.c +1 -2
-               id = (cid << 4) | type;
+               id = (cid << 2) | type;
                 id = ida_simple_get(&fsi_minor_ida, id, id + 1, GFP_KERNEL);
                 if (id >= 0) {
                         *out_index = fsi_adjust_index(cid);
--

2.31.1