From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRW0i-0001Ac-S5 for qemu-devel@nongnu.org; Mon, 17 Aug 2015 21:48:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZRW0e-0008Vj-CO for qemu-devel@nongnu.org; Mon, 17 Aug 2015 21:48:20 -0400 Received: from e23smtp02.au.ibm.com ([202.81.31.144]:55013) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRW0d-0008Ry-Qe for qemu-devel@nongnu.org; Mon, 17 Aug 2015 21:48:16 -0400 Received: from /spool/local by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 18 Aug 2015 11:48:12 +1000 From: Gavin Shan Date: Tue, 18 Aug 2015 11:47:06 +1000 Message-Id: <1439862430-14996-1-git-send-email-gwshan@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v5 0/4] sPAPR: Support EEH Error Injection List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aik@ozlabs.ru, peter.maydell@linaro.org, qemu-ppc@nongnu.org, Gavin Shan , david@gibson.dropbear.id.au The patchset depends on below Linux upstream commits: commit ed3e81f ("powerpc/eeh: Move PE state constants around") commit ec33d36 ("powerpc/eeh: Introduce eeh_pe_inject_err()") According to PAPR specification 2.7, there're 3 RTAS calls relevent to error injection: "ibm,open-errinjct", "ibm,close-errinjct", "ibm,errinjct". The userland utility "errinjct" running on guest utilizes those 3 RTAS calls like this way: Call "ibm,open-errinjct" that returns open-token, which is passed to "ibm,errinjct" together with error specific arguments to do error injection. Finally, to return the open-token by calling "ibm,close-errinject". "ibm,errinjct" can be used to inject various errors, not limited to EEH errors. However, this patchset is going to support injecting EEH errors only for VFIO PCI devices. ========= Changelog ========= v5: * Put "errinjct_token" to migration stream disregarding it's opened or not. Also, it starts to be supported from v4 vmstate_spapr. * Include powerpc/include/uapi/asm/eeh.h in scripts/update_linux_headers.sh v4: * To record currently opened token, not next one as suggested by Alexey. v3: * Replace random token number with incremental counter. Another boolean variable to track if it's opened. Both of them are added to migration stream. * The return value from sPAPRPHBClass::eeh_inject_error() can be passed to user directly. No need to do conversion. * Corrected error code to RTAS_OUT_CLOSE_ERROR in rtas_ibm_errinjct(). * Don't expose error injection tokens for unsupported types. v2: * Rebased to git://github.com/dgibson/qemu.git (branch: spapr-next) * Remove specific PCI error types in hw/ppc/spapr.h. Use those macros asm-powerpc/eeh.h instead. Gavin Shan (4): scripts: Include arch/powerpc/include/uapi/asm/eeh.h linux-headers: Add eeh.h sPAPR: Support RTAS call ibm, {open, close}-errinjct sPAPR: Support RTAS call ibm,errinjct hw/ppc/spapr.c | 6 +- hw/ppc/spapr_pci.c | 36 ++++++++++ hw/ppc/spapr_pci_vfio.c | 56 ++++++++++++++++ hw/ppc/spapr_rtas.c | 143 ++++++++++++++++++++++++++++++++++++++++ include/hw/pci-host/spapr.h | 2 + include/hw/ppc/spapr.h | 17 ++++- linux-headers/asm-powerpc/eeh.h | 56 ++++++++++++++++ scripts/update-linux-headers.sh | 1 + 8 files changed, 315 insertions(+), 2 deletions(-) create mode 100644 linux-headers/asm-powerpc/eeh.h -- 2.1.0