From: Alexander Graf <agraf@suse.de>
To: David Gibson <david@gibson.dropbear.id.au>
Cc: paulus@samba.org, qemu-devel@nongnu.org, anton@samba.org
Subject: [Qemu-devel] Re: [PATCH 23/26] Implement PAPR CRQ hypercalls
Date: Wed, 16 Mar 2011 17:15:45 +0100 [thread overview]
Message-ID: <4D80E231.6040400@suse.de> (raw)
In-Reply-To: <1300251423-6715-24-git-send-email-david@gibson.dropbear.id.au>
On 03/16/2011 05:57 AM, David Gibson wrote:
> From: Ben Herrenschmidt<benh@kernel.crashing.org>
>
> This patch implements the infrastructure and hypercalls necessary for the
> PAPR specified CRQ (Command Request Queue) mechanism. This general
> request queueing system is used by many of the PAPR virtual IO devices,
> including the virtual scsi adapter.
>
> Signed-off-by: Ben Herrenschmidt<benh@kernel.crashing.org>
> Signed-off-by: David Gibson<dwg@au1.ibm.com>
> ---
> hw/spapr.c | 2 +-
> hw/spapr_vio.c | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> hw/spapr_vio.h | 12 ++++
> 3 files changed, 172 insertions(+), 1 deletions(-)
>
> diff --git a/hw/spapr.c b/hw/spapr.c
> index 44cf3cc..cb97a16 100644
> --- a/hw/spapr.c
> +++ b/hw/spapr.c
> @@ -64,7 +64,7 @@ static void *spapr_create_fdt(int *fdt_size, ram_addr_t ramsize,
> uint32_t end_prop = cpu_to_be32(initrd_base + initrd_size);
> uint32_t pft_size_prop[] = {0, cpu_to_be32(hash_shift)};
> char hypertas_prop[] = "hcall-pft\0hcall-term\0hcall-dabr\0hcall-interrupt"
> - "\0hcall-tce";
> + "\0hcall-tce\0hcall-vio";
> uint32_t interrupt_server_ranges_prop[] = {0, cpu_to_be32(smp_cpus)};
> int i;
> char *modelname;
> diff --git a/hw/spapr_vio.c b/hw/spapr_vio.c
> index 37cf51e..96668f3 100644
> --- a/hw/spapr_vio.c
> +++ b/hw/spapr_vio.c
> @@ -352,6 +352,159 @@ uint64_t ldq_tce(VIOsPAPRDevice *dev, uint64_t taddr)
> return tswap64(val);
> }
>
> +/*
> + * CRQ handling
> + */
> +static target_ulong h_reg_crq(CPUState *env, sPAPREnvironment *spapr,
> + target_ulong opcode, target_ulong *args)
> +{
> + target_ulong reg = args[0];
> + target_ulong queue_addr = args[1];
> + target_ulong queue_len = args[2];
> + VIOsPAPRDevice *dev = spapr_vio_find_by_reg(spapr->vio_bus, reg);
> +
> + if (!dev) {
> + fprintf(stderr, "h_reg_crq on non-existent unit 0x"
> + TARGET_FMT_lx "\n", reg);
> + return H_PARAMETER;
> + }
> +
> + /* We can't grok a queue size bigger than 256M for now */
> + if (queue_len< 0x1000 || queue_len> 0x10000000) {
> + fprintf(stderr, "h_reg_crq, queue size too small or too big (0x%llx)\n",
> + (unsigned long long)queue_len);
> + return H_PARAMETER;
> + }
> +
> + /* Check queue alignment */
> + if (queue_addr& 0xfff) {
> + fprintf(stderr, "h_reg_crq, queue not aligned (0x%llx)\n",
> + (unsigned long long)queue_addr);
> + return H_PARAMETER;
> + }
> +
> + /* Check if device supports CRQs */
> + if (!dev->crq.SendFunc) {
> + return H_NOT_FOUND;
> + }
> +
> +
> + /* Already a queue ? */
> + if (dev->crq.qsize) {
> + return H_RESOURCE;
> + }
> + dev->crq.qladdr = queue_addr;
> + dev->crq.qsize = queue_len;
> + dev->crq.qnext = 0;
> +
> + dprintf("CRQ for dev 0x" TARGET_FMT_lx " registered at 0x"
> + TARGET_FMT_lx "/0x" TARGET_FMT_lx "\n",
> + reg, queue_addr, queue_len);
> + return H_SUCCESS;
> +}
> +
> +static target_ulong h_free_crq(CPUState *env, sPAPREnvironment *spapr,
> + target_ulong opcode, target_ulong *args)
> +{
> + target_ulong reg = args[0];
> + VIOsPAPRDevice *dev = spapr_vio_find_by_reg(spapr->vio_bus, reg);
> +
> + if (!dev) {
> + fprintf(stderr, "h_free_crq on non-existent unit 0x"
> + TARGET_FMT_lx "\n", reg);
> + return H_PARAMETER;
> + }
> +
> + dev->crq.qladdr = 0;
> + dev->crq.qsize = 0;
> + dev->crq.qnext = 0;
> +
> + dprintf("CRQ for dev 0x" TARGET_FMT_lx " freed\n", reg);
> +
> + return H_SUCCESS;
> +}
> +
> +static target_ulong h_send_crq(CPUState *env, sPAPREnvironment *spapr,
> + target_ulong opcode, target_ulong *args)
> +{
> + target_ulong reg = args[0];
> + target_ulong msg_hi = args[1];
> + target_ulong msg_lo = args[2];
> + VIOsPAPRDevice *dev = spapr_vio_find_by_reg(spapr->vio_bus, reg);
> + uint64_t crq_mangle[2];
> +
> + if (!dev) {
> + fprintf(stderr, "h_send_crq on non-existent unit 0x"
> + TARGET_FMT_lx "\n", reg);
> + return H_PARAMETER;
> + }
> + crq_mangle[0] = cpu_to_be64(msg_hi);
> + crq_mangle[1] = cpu_to_be64(msg_lo);
> +
> + if (dev->crq.SendFunc) {
> + return dev->crq.SendFunc(dev, (uint8_t *)crq_mangle);
> + }
> +
> + return H_HARDWARE;
> +}
> +
> +static target_ulong h_enable_crq(CPUState *env, sPAPREnvironment *spapr,
> + target_ulong opcode, target_ulong *args)
> +{
> + target_ulong reg = args[0];
> + VIOsPAPRDevice *dev = spapr_vio_find_by_reg(spapr->vio_bus, reg);
> +
> + if (!dev) {
> + fprintf(stderr, "h_enable_crq on non-existent unit 0x"
> + TARGET_FMT_lx "\n", reg);
> + return H_PARAMETER;
> + }
> +
> + return 0;
> +}
> +
> +/* Returns negative error, 0 success, or positive: queue full */
> +int spapr_vio_send_crq(VIOsPAPRDevice *dev, uint8_t *crq)
> +{
> + int rc;
> + uint8_t byte;
> +
> + if (!dev->crq.qsize) {
> + fprintf(stderr, "spapr_vio_send_creq on uninitialized queue\n");
> + return -1;
> + }
> +
> + /* Maybe do a fast path for KVM just writing to the pages */
> + rc = spapr_tce_dma_read(dev, dev->crq.qladdr + dev->crq.qnext,&byte, 1);
> + if (rc) {
> + return rc;
> + }
> + if (byte != 0) {
> + return 1;
> + }
> +
> + rc = spapr_tce_dma_write(dev, dev->crq.qladdr + dev->crq.qnext + 8,&crq[8], 8);
> + if (rc) {
> + return rc;
> + }
> +#ifdef __powerpc__
> + /* Really only needed for kvm... */
Create a kvm helper function for this in target-ppc/kvm.c please that is
just a nop when !kvm.
> + asm volatile("eieio" : : : "memory");
> +#endif
Alex
next prev parent reply other threads:[~2011-03-16 16:15 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-16 4:56 [Qemu-devel] Implement emulation of pSeries logical partitions (v3) David Gibson
2011-03-16 4:56 ` [Qemu-devel] [PATCH 01/26] Clean up PowerPC SLB handling code David Gibson
2011-03-16 4:56 ` [Qemu-devel] [PATCH 02/26] Allow qemu_devtree_setprop() to take arbitrary values David Gibson
2011-03-16 4:56 ` [Qemu-devel] [PATCH 03/26] Add a hook to allow hypercalls to be emulated on PowerPC David Gibson
2011-03-16 13:46 ` [Qemu-devel] " Alexander Graf
2011-03-16 16:58 ` Stefan Hajnoczi
2011-03-17 2:26 ` David Gibson
2011-03-16 20:44 ` [Qemu-devel] " Anthony Liguori
2011-03-17 4:55 ` David Gibson
2011-03-17 13:20 ` Anthony Liguori
2011-03-18 4:03 ` David Gibson
2011-03-18 6:57 ` Alexander Graf
2011-03-16 4:56 ` [Qemu-devel] [PATCH 04/26] Implement PowerPC slbmfee and slbmfev instructions David Gibson
2011-03-16 4:56 ` [Qemu-devel] [PATCH 05/26] Implement missing parts of the logic for the POWER PURR David Gibson
2011-03-16 4:56 ` [Qemu-devel] [PATCH 06/26] Correct ppc popcntb logic, implement popcntw and popcntd David Gibson
2011-03-16 4:56 ` [Qemu-devel] [PATCH 07/26] Clean up slb_lookup() function David Gibson
2011-03-16 4:56 ` [Qemu-devel] [PATCH 08/26] Parse SDR1 on mtspr instead of at translate time David Gibson
2011-03-16 4:56 ` [Qemu-devel] [PATCH 09/26] Use "hash" more consistently in ppc mmu code David Gibson
2011-03-16 4:56 ` [Qemu-devel] [PATCH 10/26] Better factor the ppc hash translation path David Gibson
2011-03-16 4:56 ` [Qemu-devel] [PATCH 11/26] Support 1T segments on ppc David Gibson
2011-03-16 4:56 ` [Qemu-devel] [PATCH 12/26] Add POWER7 support for ppc David Gibson
2011-03-16 4:56 ` [Qemu-devel] [PATCH 13/26] Start implementing pSeries logical partition machine David Gibson
2011-03-16 14:30 ` [Qemu-devel] " Alexander Graf
2011-03-16 21:59 ` [Qemu-devel] " Anthony Liguori
2011-03-16 23:46 ` Alexander Graf
2011-03-17 3:08 ` David Gibson
2011-03-16 4:56 ` [Qemu-devel] [PATCH 14/26] Implement the bus structure for PAPR virtual IO David Gibson
2011-03-16 14:43 ` [Qemu-devel] " Alexander Graf
2011-03-16 22:04 ` [Qemu-devel] " Anthony Liguori
2011-03-17 3:19 ` David Gibson
2011-03-16 4:56 ` [Qemu-devel] [PATCH 15/26] Virtual hash page table handling on pSeries machine David Gibson
2011-03-16 15:03 ` [Qemu-devel] " Alexander Graf
2011-03-17 1:03 ` [Qemu-devel] Re: [PATCH 15/26] Virtual hash page table handling on pSeries machine' David Gibson
2011-03-17 7:35 ` Alexander Graf
2011-03-16 4:56 ` [Qemu-devel] [PATCH 16/26] Implement hcall based RTAS for pSeries machines David Gibson
2011-03-16 15:08 ` [Qemu-devel] " Alexander Graf
2011-03-17 1:22 ` David Gibson
2011-03-17 7:36 ` Alexander Graf
2011-03-16 22:08 ` [Qemu-devel] " Anthony Liguori
2011-03-16 4:56 ` [Qemu-devel] [PATCH 17/26] Implement assorted pSeries hcalls and RTAS methods David Gibson
2011-03-16 4:56 ` [Qemu-devel] [PATCH 18/26] Implement the PAPR (pSeries) virtualized interrupt controller (xics) David Gibson
2011-03-16 15:47 ` [Qemu-devel] " Alexander Graf
2011-03-17 1:29 ` David Gibson
2011-03-17 7:37 ` Alexander Graf
2011-03-16 22:16 ` [Qemu-devel] " Anthony Liguori
2011-03-17 1:34 ` David Gibson
2011-03-17 13:13 ` Anthony Liguori
2011-03-23 3:48 ` David Gibson
2011-03-16 4:56 ` [Qemu-devel] [PATCH 19/26] Add PAPR H_VIO_SIGNAL hypercall and infrastructure for VIO interrupts David Gibson
2011-03-16 15:49 ` [Qemu-devel] " Alexander Graf
2011-03-17 1:38 ` David Gibson
2011-03-17 7:38 ` Alexander Graf
2011-03-16 4:56 ` [Qemu-devel] [PATCH 20/26] Add (virtual) interrupt to PAPR virtual tty device David Gibson
2011-03-16 4:56 ` [Qemu-devel] [PATCH 21/26] Implement TCE translation for sPAPR VIO David Gibson
2011-03-16 16:03 ` [Qemu-devel] " Alexander Graf
2011-03-16 20:05 ` Benjamin Herrenschmidt
2011-03-16 20:21 ` Anthony Liguori
2011-03-16 20:22 ` Anthony Liguori
2011-03-16 20:36 ` Benjamin Herrenschmidt
2011-03-17 1:43 ` David Gibson
2011-03-16 22:20 ` [Qemu-devel] " Anthony Liguori
2011-03-18 1:58 ` David Gibson
2011-03-16 4:56 ` [Qemu-devel] [PATCH 22/26] Implement sPAPR Virtual LAN (ibmveth) David Gibson
2011-03-16 16:12 ` [Qemu-devel] " Alexander Graf
2011-03-17 2:04 ` David Gibson
2011-03-16 22:29 ` [Qemu-devel] " Anthony Liguori
2011-03-17 2:09 ` David Gibson
2011-03-16 4:57 ` [Qemu-devel] [PATCH 23/26] Implement PAPR CRQ hypercalls David Gibson
2011-03-16 16:15 ` Alexander Graf [this message]
2011-03-16 4:57 ` [Qemu-devel] [PATCH 24/26] Implement PAPR virtual SCSI interface (ibmvscsi) David Gibson
2011-03-16 16:41 ` [Qemu-devel] " Alexander Graf
2011-03-16 16:51 ` Anthony Liguori
2011-03-16 20:08 ` Benjamin Herrenschmidt
2011-03-16 20:19 ` Anthony Liguori
2011-03-16 4:57 ` [Qemu-devel] [PATCH 25/26] Add a PAPR TCE-bypass mechanism for the pSeries machine David Gibson
2011-03-16 16:43 ` [Qemu-devel] " Alexander Graf
2011-03-17 2:21 ` David Gibson
2011-03-17 3:25 ` Benjamin Herrenschmidt
2011-03-17 7:44 ` Alexander Graf
2011-03-17 8:44 ` Benjamin Herrenschmidt
2011-03-17 9:37 ` Alexander Graf
2011-03-16 4:57 ` [Qemu-devel] [PATCH 26/26] Implement PAPR VPA functions for pSeries shared processor partitions David Gibson
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=4D80E231.6040400@suse.de \
--to=agraf@suse.de \
--cc=anton@samba.org \
--cc=david@gibson.dropbear.id.au \
--cc=paulus@samba.org \
--cc=qemu-devel@nongnu.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).