| Message ID | 20230711042437.69381-6-shannon.nelson@amd.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | pds_vdpa: mac, reset, and irq updates | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Tue, Jul 11, 2023 at 12:25 PM Shannon Nelson <shannon.nelson@amd.com> wrote: > > Make clearer in debugfs output the difference between the hw > feature bits, the features supported through the driver, and > the features that have been negotiated. > > Signed-off-by: Shannon Nelson <shannon.nelson@amd.com> Acked-by: Jason Wang <jasowang@redhat.com> Thanks > --- > drivers/vdpa/pds/debugfs.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/drivers/vdpa/pds/debugfs.c b/drivers/vdpa/pds/debugfs.c > index 754ccb7a6666..9b04aad6ec35 100644 > --- a/drivers/vdpa/pds/debugfs.c > +++ b/drivers/vdpa/pds/debugfs.c > @@ -176,6 +176,7 @@ static int identity_show(struct seq_file *seq, void *v) > { > struct pds_vdpa_aux *vdpa_aux = seq->private; > struct vdpa_mgmt_dev *mgmt; > + u64 hw_features; > > seq_printf(seq, "aux_dev: %s\n", > dev_name(&vdpa_aux->padev->aux_dev.dev)); > @@ -183,8 +184,9 @@ static int identity_show(struct seq_file *seq, void *v) > mgmt = &vdpa_aux->vdpa_mdev; > seq_printf(seq, "max_vqs: %d\n", mgmt->max_supported_vqs); > seq_printf(seq, "config_attr_mask: %#llx\n", mgmt->config_attr_mask); > - seq_printf(seq, "supported_features: %#llx\n", mgmt->supported_features); > - print_feature_bits_all(seq, mgmt->supported_features); > + hw_features = le64_to_cpu(vdpa_aux->ident.hw_features); > + seq_printf(seq, "hw_features: %#llx\n", hw_features); > + print_feature_bits_all(seq, hw_features); > > return 0; > } > @@ -200,7 +202,6 @@ static int config_show(struct seq_file *seq, void *v) > { > struct pds_vdpa_device *pdsv = seq->private; > struct virtio_net_config vc; > - u64 driver_features; > u8 status; > > memcpy_fromio(&vc, pdsv->vdpa_aux->vd_mdev.device, > @@ -223,10 +224,8 @@ static int config_show(struct seq_file *seq, void *v) > status = vp_modern_get_status(&pdsv->vdpa_aux->vd_mdev); > seq_printf(seq, "dev_status: %#x\n", status); > print_status_bits(seq, status); > - > - driver_features = vp_modern_get_driver_features(&pdsv->vdpa_aux->vd_mdev); > - seq_printf(seq, "driver_features: %#llx\n", driver_features); > - print_feature_bits_all(seq, driver_features); > + seq_printf(seq, "negotiated_features: %#llx\n", pdsv->negotiated_features); > + print_feature_bits_all(seq, pdsv->negotiated_features); > seq_printf(seq, "vdpa_index: %d\n", pdsv->vdpa_index); > seq_printf(seq, "num_vqs: %d\n", pdsv->num_vqs); > > -- > 2.17.1 >
diff --git a/drivers/vdpa/pds/debugfs.c b/drivers/vdpa/pds/debugfs.c index 754ccb7a6666..9b04aad6ec35 100644 --- a/drivers/vdpa/pds/debugfs.c +++ b/drivers/vdpa/pds/debugfs.c @@ -176,6 +176,7 @@ static int identity_show(struct seq_file *seq, void *v) { struct pds_vdpa_aux *vdpa_aux = seq->private; struct vdpa_mgmt_dev *mgmt; + u64 hw_features; seq_printf(seq, "aux_dev: %s\n", dev_name(&vdpa_aux->padev->aux_dev.dev)); @@ -183,8 +184,9 @@ static int identity_show(struct seq_file *seq, void *v) mgmt = &vdpa_aux->vdpa_mdev; seq_printf(seq, "max_vqs: %d\n", mgmt->max_supported_vqs); seq_printf(seq, "config_attr_mask: %#llx\n", mgmt->config_attr_mask); - seq_printf(seq, "supported_features: %#llx\n", mgmt->supported_features); - print_feature_bits_all(seq, mgmt->supported_features); + hw_features = le64_to_cpu(vdpa_aux->ident.hw_features); + seq_printf(seq, "hw_features: %#llx\n", hw_features); + print_feature_bits_all(seq, hw_features); return 0; } @@ -200,7 +202,6 @@ static int config_show(struct seq_file *seq, void *v) { struct pds_vdpa_device *pdsv = seq->private; struct virtio_net_config vc; - u64 driver_features; u8 status; memcpy_fromio(&vc, pdsv->vdpa_aux->vd_mdev.device, @@ -223,10 +224,8 @@ static int config_show(struct seq_file *seq, void *v) status = vp_modern_get_status(&pdsv->vdpa_aux->vd_mdev); seq_printf(seq, "dev_status: %#x\n", status); print_status_bits(seq, status); - - driver_features = vp_modern_get_driver_features(&pdsv->vdpa_aux->vd_mdev); - seq_printf(seq, "driver_features: %#llx\n", driver_features); - print_feature_bits_all(seq, driver_features); + seq_printf(seq, "negotiated_features: %#llx\n", pdsv->negotiated_features); + print_feature_bits_all(seq, pdsv->negotiated_features); seq_printf(seq, "vdpa_index: %d\n", pdsv->vdpa_index); seq_printf(seq, "num_vqs: %d\n", pdsv->num_vqs);
Make clearer in debugfs output the difference between the hw feature bits, the features supported through the driver, and the features that have been negotiated. Signed-off-by: Shannon Nelson <shannon.nelson@amd.com> --- drivers/vdpa/pds/debugfs.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)