fsi: Disable link when slave init fails
Subsystems (2)
Eddie James
maintainercover fsi: Disable link when slave init fails
This series modifies the link_enable function to accept a boolean parameter to indicate whether to enable or disable the link. Then, it disables the link when initialization of the slave fails or if there is no slave on the link.
Eddie James (3):
fsi: master: Remove link enable read-back
fsi: master: Add boolean parameter to link_enable function
fsi: core: Disable link when slave init fails
drivers/fsi/fsi-core.c | 15 +++++++++++++-- drivers/fsi/fsi-master-aspeed.c | 25 +++++++++++-------------- drivers/fsi/fsi-master-ast-cf.c | 5 +++-- drivers/fsi/fsi-master-gpio.c | 5 +++-- drivers/fsi/fsi-master-hub.c | 17 ++++++++++++----- drivers/fsi/fsi-master.h | 3 ++- 6 files changed, 44 insertions(+), 26 deletions(-)
Signature · 1 line
2.24.0
Eddie James
maintainerPATCH 1/3 fsi: master: Remove link enable read-back
Both the Aspeed and hub masters read back the link enable register after enabling the link, but this is unnecessary, so remove it.
--- drivers/fsi/fsi-master-aspeed.c | 11 +---------- drivers/fsi/fsi-master-hub.c | 6 +++--- 2 files changed, 4 insertions(+), 13 deletions(-)
drivers/fsi/fsi-master-aspeed.c +1 -10
@@ -306,7 +306,7 @@ static int aspeed_master_link_enable(struct fsi_master *master, int link) {struct fsi_master_aspeed *aspeed =to_fsi_master_aspeed (master);int idx, bit, ret; -__be32 reg, result; +__be32 reg; idx = link /32 ; bit = link %32 ;
@@ -319,15 +319,6 @@ static int aspeed_master_link_enable(struct fsi_master *master, int link)mdelay (FSI_LINK_ENABLE_SETUP_TIME ); - ret =opb_readl (aspeed, ctrl_base +FSI_MENP0 + (4 * idx), &result); -if (ret) -return ret; - -if (result != reg) { -dev_err (aspeed->dev,"%s failed: %08x\n" , __func__, result); -return -EIO ; - } -return 0 ; }
drivers/fsi/fsi-master-hub.c +3 -3
@@ -90,12 +90,12 @@ static int hub_master_link_enable(struct fsi_master *master, int link) reg =cpu_to_be32 (0x80000000 >> bit); rc =fsi_device_write (hub->upstream,FSI_MSENP0 + (4 * idx), ®,4 ); +if (rc) +return rc;mdelay (FSI_LINK_ENABLE_SETUP_TIME ); -fsi_device_read (hub->upstream,FSI_MENP0 + (4 * idx), ®,4 ); - -return rc; +return 0 ; }static void hub_master_release (struct device *dev)
Signature · 1 line
2.24.0
Eddie James
maintainerPATCH 2/3 fsi: master: Add boolean parameter to link_enable function
In reply to Eddie JamesAdd the ability to disable a link with a boolean parameter to the link_enable function.
--- drivers/fsi/fsi-core.c | 2 +- drivers/fsi/fsi-master-aspeed.c | 18 ++++++++++++------ drivers/fsi/fsi-master-ast-cf.c | 5 +++-- drivers/fsi/fsi-master-gpio.c | 5 +++-- drivers/fsi/fsi-master-hub.c | 19 +++++++++++++------ drivers/fsi/fsi-master.h | 3 ++- 6 files changed, 34 insertions(+), 18 deletions(-)
drivers/fsi/fsi-core.c +1 -1
@@ -1157,7 +1157,7 @@ static int fsi_master_write(struct fsi_master *master, int link,static int fsi_master_link_enable (struct fsi_master *master,int link) {if (master->link_enable) -return master->link_enable (master, link); +return master->link_enable (master, link, true);return 0 ; }
drivers/fsi/fsi-master-aspeed.c +12 -6
@@ -302,7 +302,8 @@ static int aspeed_master_write(struct fsi_master *master, int link,return 0 ; } -static int aspeed_master_link_enable (struct fsi_master *master,int link) +static int aspeed_master_link_enable (struct fsi_master *master,int link, +bool enable) {struct fsi_master_aspeed *aspeed =to_fsi_master_aspeed (master);int idx, bit, ret;
@@ -313,13 +314,18 @@ static int aspeed_master_link_enable(struct fsi_master *master, int link) reg =cpu_to_be32 (0x80000000 >> bit); - ret =opb_writel (aspeed, ctrl_base +FSI_MSENP0 + (4 * idx), reg); -if (ret) -return ret; +if (enable) { + ret =opb_writel (aspeed, ctrl_base +FSI_MSENP0 + (4 * idx), + reg); +if (ret) +return ret; -mdelay (FSI_LINK_ENABLE_SETUP_TIME ); +mdelay (FSI_LINK_ENABLE_SETUP_TIME ); -return 0 ; +return 0 ; + } + +return opb_writel (aspeed, ctrl_base +FSI_MCENP0 + (4 * idx), reg); }static int aspeed_master_term (struct fsi_master *master,int link,uint8_t id)
drivers/fsi/fsi-master-ast-cf.c +3 -2
@@ -1039,7 +1039,8 @@ static void fsi_master_acf_setup_external(struct fsi_master_acf *master)gpiod_direction_input (master->gpio_data); } -static int fsi_master_acf_link_enable (struct fsi_master *_master,int link) +static int fsi_master_acf_link_enable (struct fsi_master *_master,int link, +bool enable) {struct fsi_master_acf *master =to_fsi_master_acf (_master);int rc = -EBUSY ;
@@ -1049,7 +1050,7 @@ static int fsi_master_acf_link_enable(struct fsi_master *_master, int link)mutex_lock (&master->lock);if (!master->external_mode) { -gpiod_set_value (master->gpio_enable,1 ); +gpiod_set_value (master->gpio_enable, enable ?1 :0 ); rc =0 ; }mutex_unlock (&master->lock);
drivers/fsi/fsi-master-gpio.c +3 -2
@@ -678,7 +678,8 @@ static void fsi_master_gpio_init_external(struct fsi_master_gpio *master)gpiod_direction_input (master->gpio_data); } -static int fsi_master_gpio_link_enable (struct fsi_master *_master,int link) +static int fsi_master_gpio_link_enable (struct fsi_master *_master,int link, +bool enable) {struct fsi_master_gpio *master =to_fsi_master_gpio (_master);int rc = -EBUSY ;
@@ -688,7 +689,7 @@ static int fsi_master_gpio_link_enable(struct fsi_master *_master, int link)mutex_lock (&master->cmd_lock);if (!master->external_mode) { -gpiod_set_value (master->gpio_enable,1 ); +gpiod_set_value (master->gpio_enable, enable ?1 :0 ); rc =0 ; }mutex_unlock (&master->cmd_lock);
drivers/fsi/fsi-master-hub.c +13 -6
@@ -77,7 +77,8 @@ 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_enable (struct fsi_master *master,int link) +static int hub_master_link_enable (struct fsi_master *master,int link, +bool enable) {struct fsi_master_hub *hub =to_fsi_master_hub (master);int idx, bit;
@@ -89,13 +90,19 @@ static int hub_master_link_enable(struct fsi_master *master, int link) reg =cpu_to_be32 (0x80000000 >> bit); - rc =fsi_device_write (hub->upstream,FSI_MSENP0 + (4 * idx), ®,4 ); -if (rc) -return rc; +if (enable) { + rc =fsi_device_write (hub->upstream,FSI_MSENP0 + (4 * idx), + ®,4 ); +if (rc) +return rc; -mdelay (FSI_LINK_ENABLE_SETUP_TIME ); +mdelay (FSI_LINK_ENABLE_SETUP_TIME ); -return 0 ; +return 0 ; + } + +return fsi_device_write (hub->upstream,FSI_MCENP0 + (4 * idx), ®, +4 ); }static void hub_master_release (struct device *dev)
drivers/fsi/fsi-master.h +2 -1
@@ -130,7 +130,8 @@ 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); };
Signature · 1 line
2.24.0
Eddie James
maintainerPATCH 3/3 fsi: core: Disable link when slave init fails
In reply to Eddie JamesIn the case that links don't have slaves or fail to be accessed, the master should disable the link during the scan.
--- drivers/fsi/fsi-core.c | 13 ++++++++++++- 1 file changed, 12 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_enable) +return master->link_enable (master, link, false); + +return 0 ; +} +static int fsi_master_link_enable (struct fsi_master *master,int link) {if (master->link_enable)
@@ -1192,12 +1200,15 @@ static int fsi_master_scan(struct fsi_master *master) } rc =fsi_master_break (master, link);if (rc) { +fsi_master_link_disable (master, link);dev_dbg (&master->dev,"break to link %d failed: %d\n" , link, rc);continue ; } -fsi_slave_init (master, link,0 ); + rc =fsi_slave_init (master, link,0 ); +if (rc) +fsi_master_link_disable (master, link); }return 0 ;
Signature · 1 line
2.24.0
Re: [PATCH linux dev-5.4 1/3] fsi: master: Remove link enable read-back
In reply to Eddie JamesQuoted 2 lines · Eddie James
Both the Aspeed and hub masters read back the link enable register after enabling the link, but this is unnecessary, so remove it.
Unfortunately the code isn't commented, but you're making the assertion that it's not necessary without explaining why. Are we sure it's not implementing a workaround e.g. to make sure the write is flushed?
Or is this assertion made on the basis that the result is unused?
Andrew
Re: [PATCH linux dev-5.4 2/3] fsi: master: Add boolean parameter to link_enable function
In reply to Eddie JamesQuoted 2 lines · Eddie James
Add the ability to disable a link with a boolean parameter to the
link_enablefunction.
Right, but when might we want to disable a link? This functionality didn't exist previously, so why does it need to exist now?
Andrew
Re: [PATCH linux dev-5.4 3/3] fsi: core: Disable link when slave init fails
In reply to Eddie JamesQuoted 2 lines · Eddie James
In the case that links don't have slaves or fail to be accessed, the master should disable the link during the scan.
What are the side-effects of leaving it enabled?
Andrew