| Message ID | 20230103165337.1570238-2-fenghua.yu@intel.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Expose IAA 2.0 device capabilities | expand |
On 03-01-23, 08:53, Fenghua Yu wrote: > From: Dave Jiang <dave.jiang@intel.com> > > SWERROR register is 4 64bit wide registers. Currently the sysfs attribute > just outputs 4 64bit hex integers. Covert to output with %*pb format s/Covert/Convert > specifier. > > Signed-off-by: Dave Jiang <dave.jiang@intel.com> > Co-developed-by: Fenghua Yu <fenghua.yu@intel.com> > Signed-off-by: Fenghua Yu <fenghua.yu@intel.com> > --- > drivers/dma/idxd/idxd.h | 1 + > drivers/dma/idxd/init.c | 2 +- > drivers/dma/idxd/sysfs.c | 10 ++++------ > 3 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/drivers/dma/idxd/idxd.h b/drivers/dma/idxd/idxd.h > index f92f8ec83722..e449d905bea3 100644 > --- a/drivers/dma/idxd/idxd.h > +++ b/drivers/dma/idxd/idxd.h > @@ -654,6 +654,7 @@ int idxd_register_driver(void); > void idxd_unregister_driver(void); > void idxd_wqs_quiesce(struct idxd_device *idxd); > bool idxd_queue_int_handle_resubmit(struct idxd_desc *desc); > +void multi_u64_to_bmap(unsigned long *bmap, u64 *val, int count); This change does not belong to this patch, I dont know why this is here > > /* device interrupt control */ > irqreturn_t idxd_misc_thread(int vec, void *data); > diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c > index 564c025b9b7e..996bd3e4e50f 100644 > --- a/drivers/dma/idxd/init.c > +++ b/drivers/dma/idxd/init.c > @@ -425,7 +425,7 @@ static void idxd_read_table_offsets(struct idxd_device *idxd) > dev_dbg(dev, "IDXD Perfmon Offset: %#x\n", idxd->perfmon_offset); > } > > -static void multi_u64_to_bmap(unsigned long *bmap, u64 *val, int count) > +void multi_u64_to_bmap(unsigned long *bmap, u64 *val, int count) > { > int i, j, nr; > > diff --git a/drivers/dma/idxd/sysfs.c b/drivers/dma/idxd/sysfs.c > index c772172d4ceb..dae28509e6ed 100644 > --- a/drivers/dma/idxd/sysfs.c > +++ b/drivers/dma/idxd/sysfs.c > @@ -1506,15 +1506,13 @@ static ssize_t errors_show(struct device *dev, > struct device_attribute *attr, char *buf) > { > struct idxd_device *idxd = confdev_to_idxd(dev); > - int i, out = 0; > + DECLARE_BITMAP(swerr_bmap, 256); > > + bitmap_zero(swerr_bmap, 256); > spin_lock(&idxd->dev_lock); > - for (i = 0; i < 4; i++) > - out += sysfs_emit_at(buf, out, "%#018llx ", idxd->sw_err.bits[i]); > + multi_u64_to_bmap(swerr_bmap, &idxd->sw_err.bits[0], 4); > spin_unlock(&idxd->dev_lock); > - out--; > - out += sysfs_emit_at(buf, out, "\n"); > - return out; > + return sysfs_emit(buf, "%*pb\n", 256, swerr_bmap); > } > static DEVICE_ATTR_RO(errors); > > -- > 2.32.0
diff --git a/drivers/dma/idxd/idxd.h b/drivers/dma/idxd/idxd.h index f92f8ec83722..e449d905bea3 100644 --- a/drivers/dma/idxd/idxd.h +++ b/drivers/dma/idxd/idxd.h @@ -654,6 +654,7 @@ int idxd_register_driver(void); void idxd_unregister_driver(void); void idxd_wqs_quiesce(struct idxd_device *idxd); bool idxd_queue_int_handle_resubmit(struct idxd_desc *desc); +void multi_u64_to_bmap(unsigned long *bmap, u64 *val, int count); /* device interrupt control */ irqreturn_t idxd_misc_thread(int vec, void *data); diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c index 564c025b9b7e..996bd3e4e50f 100644 --- a/drivers/dma/idxd/init.c +++ b/drivers/dma/idxd/init.c @@ -425,7 +425,7 @@ static void idxd_read_table_offsets(struct idxd_device *idxd) dev_dbg(dev, "IDXD Perfmon Offset: %#x\n", idxd->perfmon_offset); } -static void multi_u64_to_bmap(unsigned long *bmap, u64 *val, int count) +void multi_u64_to_bmap(unsigned long *bmap, u64 *val, int count) { int i, j, nr; diff --git a/drivers/dma/idxd/sysfs.c b/drivers/dma/idxd/sysfs.c index c772172d4ceb..dae28509e6ed 100644 --- a/drivers/dma/idxd/sysfs.c +++ b/drivers/dma/idxd/sysfs.c @@ -1506,15 +1506,13 @@ static ssize_t errors_show(struct device *dev, struct device_attribute *attr, char *buf) { struct idxd_device *idxd = confdev_to_idxd(dev); - int i, out = 0; + DECLARE_BITMAP(swerr_bmap, 256); + bitmap_zero(swerr_bmap, 256); spin_lock(&idxd->dev_lock); - for (i = 0; i < 4; i++) - out += sysfs_emit_at(buf, out, "%#018llx ", idxd->sw_err.bits[i]); + multi_u64_to_bmap(swerr_bmap, &idxd->sw_err.bits[0], 4); spin_unlock(&idxd->dev_lock); - out--; - out += sysfs_emit_at(buf, out, "\n"); - return out; + return sysfs_emit(buf, "%*pb\n", 256, swerr_bmap); } static DEVICE_ATTR_RO(errors);