From: Gurchetan Singh <gurchetansingh@chromium.org> To: dri-devel@lists.freedesktop.org, virtio-dev@lists.oasis-open.org Cc: sebastien.boeuf@intel.com, kraxel@redhat.com, vgoyal@redhat.com, mst@redhat.com Subject: [PATCH 07/24] virtio: Implement get_shm_region for MMIO transport Date: Thu, 13 Aug 2020 19:39:43 -0700 [thread overview] Message-ID: <20200814024000.2485-8-gurchetansingh@chromium.org> (raw) In-Reply-To: <20200814024000.2485-1-gurchetansingh@chromium.org> From: Sebastien Boeuf <sebastien.boeuf@intel.com> On MMIO a new set of registers is defined for finding SHM regions. Add their definitions and use them to find the region. Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com> --- drivers/virtio/virtio_mmio.c | 31 +++++++++++++++++++++++++++++++ include/uapi/linux/virtio_mmio.h | 11 +++++++++++ 2 files changed, 42 insertions(+) diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index 627ac0487494..238383ff1064 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -498,6 +498,36 @@ static const char *vm_bus_name(struct virtio_device *vdev) return vm_dev->pdev->name; } +static bool vm_get_shm_region(struct virtio_device *vdev, + struct virtio_shm_region *region, u8 id) +{ + struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev); + u64 len, addr; + + /* Select the region we're interested in */ + writel(id, vm_dev->base + VIRTIO_MMIO_SHM_SEL); + + /* Read the region size */ + len = (u64) readl(vm_dev->base + VIRTIO_MMIO_SHM_LEN_LOW); + len |= (u64) readl(vm_dev->base + VIRTIO_MMIO_SHM_LEN_HIGH) << 32; + + region->len = len; + + /* Check if region length is -1. If that's the case, the shared memory + * region does not exist and there is no need to proceed further. + */ + if (len == ~(u64)0) + return false; + + /* Read the region base address */ + addr = (u64) readl(vm_dev->base + VIRTIO_MMIO_SHM_BASE_LOW); + addr |= (u64) readl(vm_dev->base + VIRTIO_MMIO_SHM_BASE_HIGH) << 32; + + region->addr = addr; + + return true; +} + static const struct virtio_config_ops virtio_mmio_config_ops = { .get = vm_get, .set = vm_set, @@ -510,6 +540,7 @@ static const struct virtio_config_ops virtio_mmio_config_ops = { .get_features = vm_get_features, .finalize_features = vm_finalize_features, .bus_name = vm_bus_name, + .get_shm_region = vm_get_shm_region, }; diff --git a/include/uapi/linux/virtio_mmio.h b/include/uapi/linux/virtio_mmio.h index c4b09689ab64..0650f91bea6c 100644 --- a/include/uapi/linux/virtio_mmio.h +++ b/include/uapi/linux/virtio_mmio.h @@ -122,6 +122,17 @@ #define VIRTIO_MMIO_QUEUE_USED_LOW 0x0a0 #define VIRTIO_MMIO_QUEUE_USED_HIGH 0x0a4 +/* Shared memory region id */ +#define VIRTIO_MMIO_SHM_SEL 0x0ac + +/* Shared memory region length, 64 bits in two halves */ +#define VIRTIO_MMIO_SHM_LEN_LOW 0x0b0 +#define VIRTIO_MMIO_SHM_LEN_HIGH 0x0b4 + +/* Shared memory region base address, 64 bits in two halves */ +#define VIRTIO_MMIO_SHM_BASE_LOW 0x0b8 +#define VIRTIO_MMIO_SHM_BASE_HIGH 0x0bc + /* Configuration atomicity value */ #define VIRTIO_MMIO_CONFIG_GENERATION 0x0fc -- 2.24.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Gurchetan Singh <gurchetansingh@chromium.org> To: dri-devel@lists.freedesktop.org, virtio-dev@lists.oasis-open.org Cc: kraxel@redhat.com, mst@redhat.com, vgoyal@redhat.com, sebastien.boeuf@intel.com Subject: [virtio-dev] [PATCH 07/24] virtio: Implement get_shm_region for MMIO transport Date: Thu, 13 Aug 2020 19:39:43 -0700 [thread overview] Message-ID: <20200814024000.2485-8-gurchetansingh@chromium.org> (raw) In-Reply-To: <20200814024000.2485-1-gurchetansingh@chromium.org> From: Sebastien Boeuf <sebastien.boeuf@intel.com> On MMIO a new set of registers is defined for finding SHM regions. Add their definitions and use them to find the region. Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com> --- drivers/virtio/virtio_mmio.c | 31 +++++++++++++++++++++++++++++++ include/uapi/linux/virtio_mmio.h | 11 +++++++++++ 2 files changed, 42 insertions(+) diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index 627ac0487494..238383ff1064 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -498,6 +498,36 @@ static const char *vm_bus_name(struct virtio_device *vdev) return vm_dev->pdev->name; } +static bool vm_get_shm_region(struct virtio_device *vdev, + struct virtio_shm_region *region, u8 id) +{ + struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev); + u64 len, addr; + + /* Select the region we're interested in */ + writel(id, vm_dev->base + VIRTIO_MMIO_SHM_SEL); + + /* Read the region size */ + len = (u64) readl(vm_dev->base + VIRTIO_MMIO_SHM_LEN_LOW); + len |= (u64) readl(vm_dev->base + VIRTIO_MMIO_SHM_LEN_HIGH) << 32; + + region->len = len; + + /* Check if region length is -1. If that's the case, the shared memory + * region does not exist and there is no need to proceed further. + */ + if (len == ~(u64)0) + return false; + + /* Read the region base address */ + addr = (u64) readl(vm_dev->base + VIRTIO_MMIO_SHM_BASE_LOW); + addr |= (u64) readl(vm_dev->base + VIRTIO_MMIO_SHM_BASE_HIGH) << 32; + + region->addr = addr; + + return true; +} + static const struct virtio_config_ops virtio_mmio_config_ops = { .get = vm_get, .set = vm_set, @@ -510,6 +540,7 @@ static const struct virtio_config_ops virtio_mmio_config_ops = { .get_features = vm_get_features, .finalize_features = vm_finalize_features, .bus_name = vm_bus_name, + .get_shm_region = vm_get_shm_region, }; diff --git a/include/uapi/linux/virtio_mmio.h b/include/uapi/linux/virtio_mmio.h index c4b09689ab64..0650f91bea6c 100644 --- a/include/uapi/linux/virtio_mmio.h +++ b/include/uapi/linux/virtio_mmio.h @@ -122,6 +122,17 @@ #define VIRTIO_MMIO_QUEUE_USED_LOW 0x0a0 #define VIRTIO_MMIO_QUEUE_USED_HIGH 0x0a4 +/* Shared memory region id */ +#define VIRTIO_MMIO_SHM_SEL 0x0ac + +/* Shared memory region length, 64 bits in two halves */ +#define VIRTIO_MMIO_SHM_LEN_LOW 0x0b0 +#define VIRTIO_MMIO_SHM_LEN_HIGH 0x0b4 + +/* Shared memory region base address, 64 bits in two halves */ +#define VIRTIO_MMIO_SHM_BASE_LOW 0x0b8 +#define VIRTIO_MMIO_SHM_BASE_HIGH 0x0bc + /* Configuration atomicity value */ #define VIRTIO_MMIO_CONFIG_GENERATION 0x0fc -- 2.24.1 --------------------------------------------------------------------- To unsubscribe, e-mail: virtio-dev-unsubscribe@lists.oasis-open.org For additional commands, e-mail: virtio-dev-help@lists.oasis-open.org
next prev parent reply other threads:[~2020-08-14 2:40 UTC|newest] Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-08-14 2:39 [PATCH 00/24] Blob prerequisites + blob resources Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 01/24] drm/virtio: Revert "drm/virtio: Call the right shmem helpers" Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 02/24] virtio: add dma-buf support for exported objects Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 03/24] virtio-gpu: add VIRTIO_GPU_F_RESOURCE_UUID feature Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 04/24] drm/virtio: Support virtgpu exported resources Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 05/24] virtio: Add get_shm_region method Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 06/24] virtio: Implement get_shm_region for PCI transport Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` Gurchetan Singh [this message] 2020-08-14 2:39 ` [virtio-dev] [PATCH 07/24] virtio: Implement get_shm_region for MMIO transport Gurchetan Singh 2020-08-14 2:39 ` [PATCH 08/24] drm/virtio: blob prep: refactor getting pages and attaching backing Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 09/24] drm/virtio: blob prep: make CPU responses more generic Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 10/24] virtio-gpu api: blob resources Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 11/24] virtio-gpu api: host visible feature Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 12/24] virtio-gpu api: cross-device feature Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 13/24] drm/virtio: implement blob resources: probe for the feature Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 14/24] drm/virtio: implement blob resources: probe for host visible region Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-16 13:10 ` kernel test robot 2020-08-16 13:10 ` kernel test robot 2020-08-14 2:39 ` [PATCH 15/24] drm/virtio: implement blob resources: expose virtio_gpu_resource_id_get Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 16/24] drm/virtio: implement blob resources: add new fields to internal structs Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 17/24] drm/virtio: implement blob resources: implement vram object Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 5:39 ` kernel test robot 2020-08-14 5:39 ` kernel test robot 2020-08-14 2:39 ` [PATCH 18/24] drm/virtio: implement blob resources: hypercall interface Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 6:12 ` kernel test robot 2020-08-14 6:12 ` kernel test robot 2020-08-14 2:39 ` [PATCH 19/24] drm/virtio: implement blob resources: blob display integration Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 20/24] drm/virtio: implement blob resources: refactor UUID code somewhat Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 21/24] drm/virtio: implement blob resources: fix stride discrepancy Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 22/24] drm/virtio: implement blob resources: report blob mem to userspace Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 23/24] drm/virtio: implement blob resources: resource create blob ioctl Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-17 17:46 ` Anthoine Bourgeois 2020-08-14 2:40 ` [PATCH 24/24] drm/virtio: advertise features to userspace Gurchetan Singh 2020-08-14 2:40 ` [virtio-dev] " Gurchetan Singh
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200814024000.2485-8-gurchetansingh@chromium.org \ --to=gurchetansingh@chromium.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=kraxel@redhat.com \ --cc=mst@redhat.com \ --cc=sebastien.boeuf@intel.com \ --cc=vgoyal@redhat.com \ --cc=virtio-dev@lists.oasis-open.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.