From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VocMg-00036s-4G for qemu-devel@nongnu.org; Thu, 05 Dec 2013 12:05:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VocMQ-0005pU-UN for qemu-devel@nongnu.org; Thu, 05 Dec 2013 12:05:26 -0500 Received: from e9.ny.us.ibm.com ([32.97.182.139]:36839) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VocMQ-0005p9-PC for qemu-devel@nongnu.org; Thu, 05 Dec 2013 12:05:10 -0500 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 5 Dec 2013 12:05:09 -0500 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Roth In-Reply-To: <529FE613.5050106@ozlabs.ru> References: <1386206394-21092-1-git-send-email-mdroth@linux.vnet.ibm.com> <1386206394-21092-2-git-send-email-mdroth@linux.vnet.ibm.com> <529FE613.5050106@ozlabs.ru> Message-ID: <20131205170503.5523.77019@loki> Date: Thu, 05 Dec 2013 11:05:03 -0600 Subject: Re: [Qemu-devel] [PATCH 01/14] spapr_pci: add set-indicator RTAS interface List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexey Kardashevskiy , qemu-devel@nongnu.org Cc: agraf@suse.de, ncmike@ncultra.org, paulus@samba.org, tyreld@linux.vnet.ibm.com, nfont@linux.vnet.ibm.com, qemu-ppc@nongnu.org Quoting Alexey Kardashevskiy (2013-12-04 20:33:55) > On 12/05/2013 12:19 PM, Michael Roth wrote: > > From: Mike Day > > = > > Signed-off-by: Mike Day > > Signed-off-by: Michael Roth > > --- > > hw/ppc/spapr_pci.c | 83 ++++++++++++++++++++++++++++++++++++++++= ++++++++ > > include/hw/ppc/spapr.h | 30 +++++++++++++++++ > > 2 files changed, 113 insertions(+) > > = > > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > > index 7763149..3117390 100644 > > --- a/hw/ppc/spapr_pci.c > > +++ b/hw/ppc/spapr_pci.c > > @@ -404,6 +404,80 @@ static void rtas_ibm_query_interrupt_source_number= (PowerPCCPU *cpu, > > rtas_st(rets, 2, 1);/* 0 =3D=3D level; 1 =3D=3D edge */ > > } > > = > > +static void rtas_set_indicator(PowerPCCPU *cpu, sPAPREnvironment *spap= r, > > + uint32_t token, uint32_t nargs, > > + target_ulong args, uint32_t nret, > > + target_ulong rets) > > +{ > > + uint32_t indicator =3D rtas_ld(args, 0); > > + uint32_t drc_index =3D rtas_ld(args, 1); > > + uint32_t indicator_state =3D rtas_ld(args, 2); > > + uint32_t encoded =3D 0, shift =3D 0, mask =3D 0; > > + uint32_t *pind; > > + DrcEntry *drc_entry =3D NULL; > > + > > + if (drc_index =3D=3D 0) { /* platform indicator */ > > + pind =3D &spapr->state; > > + } else { > > + drc_entry =3D spapr_find_drc_entry(drc_index); > > + if (!drc_entry) { > > + g_warning("rtas_set_indicator: unable to find drc_entry fo= r %x", > > + drc_index); > > + rtas_st(rets, 0, NO_SUCH_INDICATOR); > > + return; > > + } > > + pind =3D &drc_entry->state; > > + } > > + > > + switch (indicator) { > > + case 9: /* EPOW */ > > + shift =3D INDICATOR_EPOW_SHIFT; > > + mask =3D INDICATOR_EPOW_MASK; > > + break; > > + case 9001: /* Isolation state */ > > + /* encode the new value into the correct bit field */ > > + shift =3D INDICATOR_ISOLATION_SHIFT; > > + mask =3D INDICATOR_ISOLATION_MASK; > > + break; > > + case 9002: /* DR */ > > + shift =3D INDICATOR_DR_SHIFT; > > + mask =3D INDICATOR_DR_MASK; > > + break; > > + case 9003: /* Allocation State */ > > + shift =3D INDICATOR_ALLOCATION_SHIFT; > > + mask =3D INDICATOR_ALLOCATION_MASK; > > + break; > > + case 9005: /* global interrupt */ > > + shift =3D INDICATOR_GLOBAL_INTERRUPT_SHIFT; > > + mask =3D INDICATOR_GLOBAL_INTERRUPT_MASK; > > + break; > > + case 9006: /* error log */ > > + shift =3D INDICATOR_ERROR_LOG_SHIFT; > > + mask =3D INDICATOR_ERROR_LOG_MASK; > > + break; > > + case 9007: /* identify */ > > + shift =3D INDICATOR_IDENTIFY_SHIFT; > > + mask =3D INDICATOR_IDENTIFY_MASK; > > + break; > > + case 9009: /* reset */ > > + shift =3D INDICATOR_RESET_SHIFT; > > + mask =3D INDICATOR_RESET_MASK; > > + break; > > + default: > > + g_warning("rtas_set_indicator: indicator not implemented: %d", > > + indicator); > > + rtas_st(rets, 0, NO_SUCH_INDICATOR); > > + return; > > + } > > + > > + encoded =3D ENCODE_DRC_STATE(indicator_state, mask, shift); > > + /* clear the current indicator value */ > > + *pind &=3D ~mask; > > + /* set the new value */ > > + *pind |=3D encoded; > > + rtas_st(rets, 0, 0); > > +} > > + > > static int pci_spapr_swizzle(int slot, int pin) > > { > > return (slot + pin) % PCI_NUM_PINS; > > @@ -637,6 +711,14 @@ static int spapr_phb_init(SysBusDevice *s) > > sphb->lsi_table[i].irq =3D irq; > > } > > = > > + /* make sure the platform EPOW sensor is initialized - the > > + * guest will probe it when there is a hotplug event. > > + */ > > + spapr->state &=3D ~(uint32_t)INDICATOR_EPOW_MASK; > > + spapr->state |=3D ENCODE_DRC_STATE(0, > > + INDICATOR_EPOW_MASK, > > + INDICATOR_EPOW_SHIFT); > > + > > return 0; > > } > > = > > @@ -856,6 +938,7 @@ void spapr_pci_rtas_init(void) > > rtas_ibm_query_interrupt_source_number); > > spapr_rtas_register("ibm,change-msi", rtas_ibm_change_msi); > > } > > + spapr_rtas_register("set-indicator", rtas_set_indicator); > > } > > = > > static void spapr_pci_register_types(void) > > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > > index b2f11e9..d8c7de4 100644 > > --- a/include/hw/ppc/spapr.h > > +++ b/include/hw/ppc/spapr.h > > @@ -38,6 +38,9 @@ typedef struct sPAPREnvironment { > > int htab_save_index; > > bool htab_first_pass; > > int htab_fd; > > + > > + /* platform state - sensors and indicators */ > > + uint32_t state; > > } sPAPREnvironment; > > = > > #define H_SUCCESS 0 > > @@ -299,6 +302,33 @@ typedef struct sPAPREnvironment { > > #define KVMPPC_H_LOGICAL_MEMOP (KVMPPC_HCALL_BASE + 0x1) > > #define KVMPPC_HCALL_MAX KVMPPC_H_LOGICAL_MEMOP > > = > > +/* For set-indicator RTAS interface */ > > +#define INDICATOR_ISOLATION_MASK 0x0001 /* 9001 one bit */ > > +#define INDICATOR_GLOBAL_INTERRUPT_MASK 0x0002 /* 9005 one bit */ > > +#define INDICATOR_ERROR_LOG_MASK 0x0004 /* 9006 one bit */ > > +#define INDICATOR_IDENTIFY_MASK 0x0008 /* 9007 one bit */ > > +#define INDICATOR_RESET_MASK 0x0010 /* 9009 one bit */ > > +#define INDICATOR_DR_MASK 0x00e0 /* 9002 three bit= s */ > > +#define INDICATOR_ALLOCATION_MASK 0x0300 /* 9003 two bits = */ > > +#define INDICATOR_EPOW_MASK 0x1c00 /* 9 three bits */ > > + > > +#define INDICATOR_ISOLATION_SHIFT 0x00 /* bit 0 */ > > +#define INDICATOR_GLOBAL_INTERRUPT_SHIFT 0x01 /* bit 1 */ > > +#define INDICATOR_ERROR_LOG_SHIFT 0x02 /* bit 2 */ > > +#define INDICATOR_IDENTIFY_SHIFT 0x03 /* bit 3 */ > > +#define INDICATOR_RESET_SHIFT 0x04 /* bit 4 */ > > +#define INDICATOR_DR_SHIFT 0x05 /* bits 5-7 */ > > +#define INDICATOR_ALLOCATION_SHIFT 0x08 /* bits 8-9 */ > > +#define INDICATOR_EPOW_SHIFT 0x0a /* bits 10-12 */ > > + > > +#define NO_SUCH_INDICATOR -3 > = > = > The ppc-next tree has these for RTAS returns, recently added: > = > #define RTAS_OUT_SUCCESS 0 > #define RTAS_OUT_NO_ERRORS_FOUND 1 > #define RTAS_OUT_HW_ERROR -1 > #define RTAS_OUT_BUSY -2 > #define RTAS_OUT_PARAM_ERROR -3 Thanks, will update to make use of these in v2 > = > = > = > = > = > = > -- = > Alexey