fsi: master: Add link_disable function
Subsystems (2)
Eddie James
maintainerPATCH v2 1/1 fsi: master: Add link_disable function
The master driver should disable links that don't have slaves or links that fail to be accessed. To do this, add a link_disable function and use it in the failure path for slave break and init.
---
Changes since v1:
- Drop the delay and read back MENP0 to check link status.
drivers/fsi/fsi-core.c | 13 ++++++++++++- drivers/fsi/fsi-master-aspeed.c | 15 +++++++++++++++ drivers/fsi/fsi-master-hub.c | 15 +++++++++++++++ drivers/fsi/fsi-master.h | 1 + 4 files changed, 43 insertions(+), 1 deletion(-)
drivers/fsi/fsi-core.c +12 -1
@@ -1154,6 +1154,14 @@ static int fsi_master_write(struct fsi_master *master, int link,return rc; } +static int fsi_master_link_disable (struct fsi_master *master,int link) +{ +if (master->link_disable) +return master->link_disable (master, link); + +return 0 ; +} +static int fsi_master_link_enable (struct fsi_master *master,int link) {if (master->link_enable)
@@ -1194,10 +1202,13 @@ static int fsi_master_scan(struct fsi_master *master)if (rc) {dev_dbg (&master->dev,"break to link %d failed: %d\n" , link, rc); +fsi_master_link_disable (master, link);continue ; } -fsi_slave_init (master, link,0 ); + rc =fsi_slave_init (master, link,0 ); +if (rc) +fsi_master_link_disable (master, link); }return 0 ;
drivers/fsi/fsi-master-aspeed.c +15 -0
@@ -299,6 +299,20 @@ static int aspeed_master_write(struct fsi_master *master, int link,return 0 ; } +static int aspeed_master_link_disable (struct fsi_master *master,int link) +{ +struct fsi_master_aspeed *aspeed =to_fsi_master_aspeed (master); +int idx, bit; +__be32 reg; + + idx = link /32 ; + bit = link %32 ; + + reg =cpu_to_be32 (0x80000000 >> bit); + +return opb_writel (aspeed, ctrl_base +FSI_MCENP0 + (4 * idx), reg); +} +static int aspeed_master_link_enable (struct fsi_master *master,int link) {struct fsi_master_aspeed *aspeed =to_fsi_master_aspeed (master);
@@ -491,6 +505,7 @@ static int fsi_master_aspeed_probe(struct platform_device *pdev) aspeed->master.write = aspeed_master_write; aspeed->master.send_break = aspeed_master_break; aspeed->master.term = aspeed_master_term; + aspeed->master.link_disable = aspeed_master_link_disable; aspeed->master.link_enable = aspeed_master_link_enable;dev_set_drvdata (&pdev->dev, aspeed);
drivers/fsi/fsi-master-hub.c +15 -0
@@ -77,6 +77,20 @@ static int hub_master_break(struct fsi_master *master, int link)return hub_master_write (master, link,0 , addr, &cmd,sizeof (cmd)); } +static int hub_master_link_disable (struct fsi_master *master,int link) +{ +struct fsi_master_hub *hub =to_fsi_master_hub (master); +int idx, bit; +__be32 reg; + + idx = link /32 ; + bit = link %32 ; + + reg =cpu_to_be32 (0x80000000 >> bit); + +return fsi_device_write (hub->upstream,FSI_MCENP0 + (4 * idx), ®,4 ); +} +static int hub_master_link_enable (struct fsi_master *master,int link) {struct fsi_master_hub *hub =to_fsi_master_hub (master);
@@ -228,6 +242,7 @@ static int hub_master_probe(struct device *dev) hub->master.read = hub_master_read; hub->master.write = hub_master_write; hub->master.send_break = hub_master_break; + hub->master.link_disable = hub_master_link_disable; hub->master.link_enable = hub_master_link_enable;dev_set_drvdata (dev, hub);
drivers/fsi/fsi-master.h +1 -0
@@ -130,6 +130,7 @@ struct fsi_master { uint32_t addr, const void *val, size_t size);int (*term)(struct fsi_master *,int link,uint8_t id);int (*send_break)(struct fsi_master *,int link); +int (*link_disable)(struct fsi_master *,int link);int (*link_enable)(struct fsi_master *,int link);int (*link_config)(struct fsi_master *,int link,u8 t_send_delay,u8 t_echo_delay);
Signature · 1 line
2.24.0
Hi Eddie,
Quoted 3 lines
The master driver should disable links that don't have slaves or links that fail to be accessed. To do this, add a
link_disablefunction and use it in the failure path for slave break and init.
Concept looks good, but would it work to merge the disable functionality with the existing link_enable callback?
ie., something like:
drivers/fsi/fsi-master.h +1 -1
@@ -130,6 +130,7 @@ struct fsi_master { uint32_t addr, const void *val, size_t size);int (*term)(struct fsi_master *,int link,uint8_t id);int (*send_break)(struct fsi_master *,int link); -int (*link_enable)(struct fsi_master *,int link); +int (*link_enable)(struct fsi_master *,int link,bool enable);int (*link_config)(struct fsi_master *,int link,u8 t_send_delay,u8 t_echo_delay);
(and add the bool to the core api too).
- as I suspect the logic between enable and disable will be much the same, aside from the actual value set.
Along those lines:
Quoted 9 lines
drivers/fsi/fsi-master-aspeed.c +3
-0@@ -299,6 +299,20 @@ static int aspeed_master_write(struct fsi_master *master, int link,return 0 ; } +static int aspeed_master_link_disable (struct fsi_master *master,int link) +{ +struct fsi_master_aspeed *aspeed =to_fsi_master_aspeed (master);
drivers/fsi/fsi-master-aspeed.c static int aspeed_master_write(struct fsi_master *master, int link, · line 314
Quoted 10 lines
drivers/fsi/fsi-master-aspeed.c +10
-0+int idx, bit; +__be32 reg; + + idx = link /32 ; + bit = link %32 ; + + reg =cpu_to_be32 (0x80000000 >> bit); + +return opb_writel (aspeed, ctrl_base +FSI_MCENP0 + (4 * idx), reg); +}
If we don't need the delay and read-back here, should we drop it from enable too?
Cheers,
Jeremy
Eddie James
maintainerQuoted 34 lines · Jeremy Kerr
Hi Eddie,
Quoted 3 lines
The master driver should disable links that don't have slaves or links that fail to be accessed. To do this, add a
link_disablefunction and use it in the failure path for slave break and init.Concept looks good, but would it work to merge the disable functionality with the existing
link_enablecallback?ie., something like:
drivers/fsi/fsi-master.h +1
-1@@ -130,6 +130,7 @@ struct fsi_master { uint32_t addr, const void *val, size_t size);int (*term)(struct fsi_master *,int link,uint8_t id);int (*send_break)(struct fsi_master *,int link); -int (*link_enable)(struct fsi_master *,int link); +int (*link_enable)(struct fsi_master *,int link,bool enable);int (*link_config)(struct fsi_master *,int link,u8 t_send_delay,u8 t_echo_delay);(and add the bool to the core api too).
- as I suspect the logic between enable and disable will be much the same, aside from the actual value set.
Along those lines:
Quoted 6 lines
drivers/fsi/fsi-master-aspeed.c +0
-0@@ -299,6 +299,20 @@ static int aspeed_master_write(struct fsi_master *master, int link,return 0 ; }
Quoted 15 lines
drivers/fsi/fsi-master-aspeed.c static int aspeed_master_write(struct fsi_master *master, int link, · line 314
Quoted 13 lines
drivers/fsi/fsi-master-aspeed.c +13
-0+static int aspeed_master_link_disable (struct fsi_master *master,int link) +{ +struct fsi_master_aspeed *aspeed =to_fsi_master_aspeed (master); +int idx, bit; +__be32 reg; + + idx = link /32 ; + bit = link %32 ; + + reg =cpu_to_be32 (0x80000000 >> bit); + +return opb_writel (aspeed, ctrl_base +FSI_MCENP0 + (4 * idx), reg); +}If we don't need the delay and read-back here, should we drop it from enable too?
No, the delay is required by the FSI spec for enabling the link.
Thanks for the review!
Eddie
Quoted 6 lines
Cheers,
Jeremy