diff options
| author | Greg Kroah-Hartman | 2022-02-21 17:47:42 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2022-02-21 17:47:42 +0100 |
| commit | c29930ef8308faf96de8365e5fb925bca6e33399 (patch) | |
| tree | 22e48f59d36cddbbe5f398395720d060d8302487 /drivers/fsi/fsi-master-aspeed.c | |
| parent | e6cb9c167eeb8f90ab924666c573e69e85e700a0 (diff) | |
| parent | f2af60bb7ce2fa5397f401cbf65725d9c87329a4 (diff) | |
Merge tag 'fsi-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi into char-misc-next
Joel writes:
FSI changes for v5.18
* Improvements in SCOM and OCC drivers for error handling and retries
* Addition of tracepoints for initialisation path
* API for setting long running SBE FIFO operations
* tag 'fsi-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi:
fsi: Add trace events in initialization path
fsi: sbefifo: Implement FSI_SBEFIFO_READ_TIMEOUT_SECONDS ioctl
fsi: sbefifo: Use specified value of start of response timeout
fsi: occ: Improve response status checking
fsi: scom: Remove retries in indirect scoms
fsi: scom: Fix error handling
Diffstat (limited to 'drivers/fsi/fsi-master-aspeed.c')
| -rw-r--r-- | drivers/fsi/fsi-master-aspeed.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/fsi/fsi-master-aspeed.c b/drivers/fsi/fsi-master-aspeed.c index 0bed2fab8055..7cec1772820d 100644 --- a/drivers/fsi/fsi-master-aspeed.c +++ b/drivers/fsi/fsi-master-aspeed.c @@ -449,11 +449,13 @@ static ssize_t cfam_reset_store(struct device *dev, struct device_attribute *att { struct fsi_master_aspeed *aspeed = dev_get_drvdata(dev); + trace_fsi_master_aspeed_cfam_reset(true); mutex_lock(&aspeed->lock); gpiod_set_value(aspeed->cfam_reset_gpio, 1); usleep_range(900, 1000); gpiod_set_value(aspeed->cfam_reset_gpio, 0); mutex_unlock(&aspeed->lock); + trace_fsi_master_aspeed_cfam_reset(false); return count; } |