| Message ID | 20250326-scsi-sync-on-write-v2-2-12ab05bd464b@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | scsi: ensure writes are flushed to disk | expand |
On 26/03/2025 13:24, Caleb Connolly wrote: > We don't have a mechanism to safely shutdown block devices prior to a > baord reset or driver removal. Prevent data loss by synchronizing the > SCSI cache after every write. > > In particular this solves the issue of capsule updates looping on some > devices because the board resets immediately after deleting the capsule > file and this write wouldn't be flushed in time. > > This may impact NAND wear, but should be negligible given the usecases > for disk write in U-Boot. > > Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org> > --- > drivers/scsi/scsi.c | 23 +++++++++++++++++++++++ > 1 file changed, 23 insertions(+) > > diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c > index 34ac47c03ab397ca999abf130d84ccbd3be4c419..3e556540cae46734d3b13a72cf279905134336f3 100644 > --- a/drivers/scsi/scsi.c > +++ b/drivers/scsi/scsi.c > @@ -77,8 +77,25 @@ static void scsi_setup_inquiry(struct scsi_cmd *pccb) > pccb->cmdlen = 6; > pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */ > } > > +static void scsi_setup_sync_cache(struct scsi_cmd *pccb, lbaint_t start, > + unsigned short blocks) > +{ > + pccb->cmd[0] = SCSI_SYNC_CACHE; > + pccb->cmd[1] = 0; > + pccb->cmd[2] = (unsigned char)(start >> 24) & 0xff; > + pccb->cmd[3] = (unsigned char)(start >> 16) & 0xff; > + pccb->cmd[4] = (unsigned char)(start >> 8) & 0xff; > + pccb->cmd[5] = (unsigned char)start & 0xff; > + pccb->cmd[6] = 0; > + pccb->cmd[7] = (unsigned char)(blocks >> 8) & 0xff; > + pccb->cmd[8] = (unsigned char)blocks & 0xff; > + pccb->cmd[9] = 0; > + pccb->cmdlen = 10; > + pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */ > +} > + > static void scsi_setup_read_ext(struct scsi_cmd *pccb, lbaint_t start, > unsigned short blocks) > { > pccb->cmd[0] = SCSI_READ10; > @@ -239,8 +256,14 @@ static ulong scsi_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, > break; > } > buf_addr += pccb->datalen; > } while (blks != 0); > + > + /* Flush the SCSI cache so we don't lose data on board reset. */ > + scsi_setup_sync_cache(pccb, 0, 0); > + if (scsi_exec(bdev, pccb)) > + scsi_print_error(pccb); > + > debug("%s: end startblk " LBAF ", blccnt %x buffer %lX\n", > __func__, start, smallblks, buf_addr); > return blkcnt; > } > Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 34ac47c03ab397ca999abf130d84ccbd3be4c419..3e556540cae46734d3b13a72cf279905134336f3 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -77,8 +77,25 @@ static void scsi_setup_inquiry(struct scsi_cmd *pccb) pccb->cmdlen = 6; pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */ } +static void scsi_setup_sync_cache(struct scsi_cmd *pccb, lbaint_t start, + unsigned short blocks) +{ + pccb->cmd[0] = SCSI_SYNC_CACHE; + pccb->cmd[1] = 0; + pccb->cmd[2] = (unsigned char)(start >> 24) & 0xff; + pccb->cmd[3] = (unsigned char)(start >> 16) & 0xff; + pccb->cmd[4] = (unsigned char)(start >> 8) & 0xff; + pccb->cmd[5] = (unsigned char)start & 0xff; + pccb->cmd[6] = 0; + pccb->cmd[7] = (unsigned char)(blocks >> 8) & 0xff; + pccb->cmd[8] = (unsigned char)blocks & 0xff; + pccb->cmd[9] = 0; + pccb->cmdlen = 10; + pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */ +} + static void scsi_setup_read_ext(struct scsi_cmd *pccb, lbaint_t start, unsigned short blocks) { pccb->cmd[0] = SCSI_READ10; @@ -239,8 +256,14 @@ static ulong scsi_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, break; } buf_addr += pccb->datalen; } while (blks != 0); + + /* Flush the SCSI cache so we don't lose data on board reset. */ + scsi_setup_sync_cache(pccb, 0, 0); + if (scsi_exec(bdev, pccb)) + scsi_print_error(pccb); + debug("%s: end startblk " LBAF ", blccnt %x buffer %lX\n", __func__, start, smallblks, buf_addr); return blkcnt; }
We don't have a mechanism to safely shutdown block devices prior to a baord reset or driver removal. Prevent data loss by synchronizing the SCSI cache after every write. In particular this solves the issue of capsule updates looping on some devices because the board resets immediately after deleting the capsule file and this write wouldn't be flushed in time. This may impact NAND wear, but should be negligible given the usecases for disk write in U-Boot. Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org> --- drivers/scsi/scsi.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)