On Thu, Feb 17, 2022 at 11:55:45AM +0200, Eli Cohen wrote: > This is required by iproute2 to display the capabilities of a vdpa based > virtio device. > > Previously, drivers/net/ethernet/sfc/mcdi_pcol.h made use of a private > definition of this flag. Modify the definition to rely on the new > generic definition. > > Signed-off-by: Eli Cohen <elic@xxxxxxxxxx> > --- > drivers/net/ethernet/sfc/mcdi_pcol.h | 2 +- > include/uapi/linux/virtio_config.h | 6 ++++++ > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/sfc/mcdi_pcol.h b/drivers/net/ethernet/sfc/mcdi_pcol.h > index d3fcbf930dba..2603e04dae06 100644 > --- a/drivers/net/ethernet/sfc/mcdi_pcol.h > +++ b/drivers/net/ethernet/sfc/mcdi_pcol.h > @@ -21477,7 +21477,7 @@ > #define VIRTIO_BLK_CONFIG_VIRTIO_F_SR_IOV_LBN 37 > #define VIRTIO_BLK_CONFIG_VIRTIO_F_SR_IOV_WIDTH 1 > #define VIRTIO_BLK_CONFIG_VIRTIO_F_NOTIFICATION_DATA_OFST 0 > -#define VIRTIO_BLK_CONFIG_VIRTIO_F_NOTIFICATION_DATA_LBN 38 > +#define VIRTIO_BLK_CONFIG_VIRTIO_F_NOTIFICATION_DATA_LBN VIRTIO_F_NOTIFICATION_DATA > #define VIRTIO_BLK_CONFIG_VIRTIO_F_NOTIFICATION_DATA_WIDTH 1 > #define VIRTIO_BLK_CONFIG_FEATURES_LBN 0 > #define VIRTIO_BLK_CONFIG_FEATURES_WIDTH 64 I don't think we need to bother with macros in mcdi_pcol.h - that header is generated by some kind of script, this probably is why it has all these macros that are otherwise unused. Cc Edward Cree who added them - Edward, is there a way to get rid of VIRTIO_ macros inmcdi_pcol.h? > diff --git a/include/uapi/linux/virtio_config.h b/include/uapi/linux/virtio_config.h > index b5eda06f0d57..30eb76dcdcad 100644 > --- a/include/uapi/linux/virtio_config.h > +++ b/include/uapi/linux/virtio_config.h > @@ -92,4 +92,10 @@ > * Does the device support Single Root I/O Virtualization? > */ > #define VIRTIO_F_SR_IOV 37 > + > +/* When negotiated, indicates that the driver can pass extra data beyond > + * virtqueue identification when sending notifications > + */ > +#define VIRTIO_F_NOTIFICATION_DATA 38 > + > #endif /* _UAPI_LINUX_VIRTIO_CONFIG_H */ > -- > 2.32.0 _______________________________________________ Virtualization mailing list Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linuxfoundation.org/mailman/listinfo/virtualization
