Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

apps: machines: clean-up the virtio device features definition #391

Merged
merged 1 commit into from
May 24, 2022
+8 −17
Merged

apps: machines: clean-up the virtio device features definition #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/machine/microblaze_generic/rsc_table.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#define __section_t(S) __attribute__((__section__(#S)))
#define __resource __section_t(.resource_table)

#define RPMSG_IPU_C0_FEATURES 1
#define RPMSG_VDEV_DFEATURES (1 << VIRTIO_RPMSG_F_NS)

#define NUM_VRINGS 0x02
#define VRING_ALIGN 0x1000
Expand All @@ -41,7 +41,7 @@ struct remote_resource_table __resource resources = {

/* Virtio device entry */
{
RSC_VDEV, VIRTIO_ID_RPMSG, 0, RPMSG_IPU_C0_FEATURES, 0, 0, 0,
RSC_VDEV, VIRTIO_ID_RPMSG, 0, RPMSG_VDEV_DFEATURES, 0, 0, 0,
NUM_VRINGS, {0, 0},
},

Expand Down
7 changes: 2 additions & 5 deletions apps/machine/zynq7/rsc_table.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,11 @@
#define __section_t(S) __attribute__((__section__(#S)))
#define __resource __section_t(.resource_table)

#define RPMSG_IPU_C0_FEATURES 1
#define RPMSG_VDEV_DFEATURES (1 << VIRTIO_RPMSG_F_NS)

/* VirtIO rpmsg device id */
#define VIRTIO_ID_RPMSG_ 7

/* Remote supports Name Service announcement */
#define VIRTIO_RPMSG_F_NS 0

/* Resource table entries */
#define NUM_VRINGS 0x02
#define VRING_ALIGN 0x1000
Expand All @@ -52,7 +49,7 @@ struct remote_resource_table __resource resources = {

/* Virtio device entry */
{
RSC_VDEV, VIRTIO_ID_RPMSG_, 0, RPMSG_IPU_C0_FEATURES, 0, 0, 0,
RSC_VDEV, VIRTIO_ID_RPMSG_, 0, RPMSG_VDEV_DFEATURES, 0, 0, 0,
NUM_VRINGS, {0, 0},
},

Expand Down
7 changes: 2 additions & 5 deletions apps/machine/zynqmp_r5/rsc_table.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,11 @@
#define __section_t(S) __attribute__((__section__(#S)))
#define __resource __section_t(.resource_table)

#define RPMSG_IPU_C0_FEATURES 1
#define RPMSG_VDEV_DFEATURES (1 << VIRTIO_RPMSG_F_NS)

/* VirtIO rpmsg device id */
#define VIRTIO_ID_RPMSG_ 7

/* Remote supports Name Service announcement */
#define VIRTIO_RPMSG_F_NS 0

#define NUM_VRINGS 0x02
#define VRING_ALIGN 0x1000
#ifndef RING_TX
Expand Down Expand Up @@ -52,7 +49,7 @@ struct remote_resource_table __resource resources = {

/* Virtio device entry */
{
RSC_VDEV, VIRTIO_ID_RPMSG_, 0, RPMSG_IPU_C0_FEATURES, 0, 0, 0,
RSC_VDEV, VIRTIO_ID_RPMSG_, 0, RPMSG_VDEV_DFEATURES, 0, 0, 0,
NUM_VRINGS, {0, 0},
},

Expand Down
7 changes: 2 additions & 5 deletions apps/system/linux/machine/generic/rsc_table.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,11 @@
#include <openamp/open_amp.h>
#include "rsc_table.h"

#define RPMSG_IPU_C0_FEATURES 1
#define RPMSG_VDEV_DFEATURES (1 << VIRTIO_RPMSG_F_NS)

/* VirtIO rpmsg device id */
#define VIRTIO_ID_RPMSG_ 7

/* Remote supports Name Service announcement */
#define VIRTIO_RPMSG_F_NS 0

#define NUM_VRINGS 0x02
#define VRING_ALIGN 0x1000
#define RING_TX 0x00004000
Expand All @@ -44,7 +41,7 @@ struct remote_resource_table resources = {

/* Virtio device entry */
{
RSC_VDEV, VIRTIO_ID_RPMSG_, 0, RPMSG_IPU_C0_FEATURES, 0, 0, 0,
RSC_VDEV, VIRTIO_ID_RPMSG_, 0, RPMSG_VDEV_DFEATURES, 0, 0, 0,
NUM_VRINGS, {0, 0},
},

Expand Down