From patchwork Mon May 5 01:28:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Shan X-Patchwork-Id: 4111251 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 035E69F23C for ; Mon, 5 May 2014 01:28:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2AC1620414 for ; Mon, 5 May 2014 01:28:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3CB5320254 for ; Mon, 5 May 2014 01:28:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754147AbaEEB2G (ORCPT ); Sun, 4 May 2014 21:28:06 -0400 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:42246 "EHLO e23smtp09.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754058AbaEEB2C (ORCPT ); Sun, 4 May 2014 21:28:02 -0400 Received: from /spool/local by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 5 May 2014 11:28:01 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp09.au.ibm.com (202.81.31.206) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 5 May 2014 11:27:58 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 7169E2CE8054; Mon, 5 May 2014 11:27:58 +1000 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s4516gGD53412032; Mon, 5 May 2014 11:06:42 +1000 Received: from d23av03.au.ibm.com (localhost [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s451RvZr013814; Mon, 5 May 2014 11:27:58 +1000 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.190.163.12]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s451Rv2v013811; Mon, 5 May 2014 11:27:57 +1000 Received: from shangw (haven.au.ibm.com [9.190.164.82]) by ozlabs.au.ibm.com (Postfix) with ESMTP id 16F4DA0117; Mon, 5 May 2014 11:27:57 +1000 (EST) Received: by shangw (Postfix, from userid 1000) id F2FAA3E0370; Mon, 5 May 2014 11:28:18 +1000 (EST) From: Gavin Shan To: linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Cc: alex.williamson@redhat.com, benh@kernel.crashing.org, aik@ozlabs.ru, qiudayu@linux.vnet.ibm.com, Gavin Shan Subject: [PATCH 13/22] powerpc/eeh: Emulate RTAS call ibm, read-slot-reset-state2 Date: Mon, 5 May 2014 11:28:02 +1000 Message-Id: <1399253291-3975-14-git-send-email-gwshan@linux.vnet.ibm.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1399253291-3975-1-git-send-email-gwshan@linux.vnet.ibm.com> References: <1399253291-3975-1-git-send-email-gwshan@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14050501-3568-0000-0000-0000056CF551 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The RTAS call "ibm,read-slot-reset-state2" is being used to retrieve the various states of the specified PE, e.g. reset state, frozen DMA, frozen MMIO etc. The patch implements the backend to emulate the RTAS call. Signed-off-by: Gavin Shan --- arch/powerpc/platforms/powernv/eeh-rtas.c | 77 +++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/arch/powerpc/platforms/powernv/eeh-rtas.c b/arch/powerpc/platforms/powernv/eeh-rtas.c index 3e38d13..031ee8c 100644 --- a/arch/powerpc/platforms/powernv/eeh-rtas.c +++ b/arch/powerpc/platforms/powernv/eeh-rtas.c @@ -260,6 +260,80 @@ out: return ret; } +static int kvmppc_eeh_get_state2(struct kvm_vcpu *vcpu, + struct rtas_args *args) +{ + struct pci_controller *hose; + struct pnv_phb *phb; + struct eeh_dev *edev; + struct eeh_pe *pe; + struct eeh_vfio_pci_addr addr; + int result, ret = 0; + + /* Sanity check on parameter */ + if (args->nargs != 3 || (args->nret != 4 && args->nret != 5)) { + pr_warn("%s: Non-matched argument (%d, %d) - (3, 4/5)\n", + __func__, args->nargs, args->nret); + ret = -3; + goto out; + } + + /* Figure out the address */ + if (kvmppc_eeh_format_addr(vcpu, args, &addr, false, &edev, &pe)) { + ret = -3; + goto out; + } + + /* Make sure that the EEH stuff has been initialized */ + hose = pe->phb; + phb = hose->private_data; + if (!(phb->flags & PNV_PHB_FLAG_EEH)) { + pr_warn("%s: EEH disabled on PHB#%d\n", + __func__, hose->global_number); + ret = -3; + args->rets[2] = 0; + goto out; + } + + /* + * Mark EEH supported on the PCI device. Otherwise, + * the PE state is meaningless to the guest + */ + args->rets[2] = 1; + + /* Call to the IOC dependent function */ + if (phb->eeh_ops && phb->eeh_ops->get_state) { + result = phb->eeh_ops->get_state(pe); + + if (!(result & EEH_STATE_RESET_ACTIVE) && + (result & EEH_STATE_DMA_ENABLED) && + (result & EEH_STATE_MMIO_ENABLED)) + args->rets[1] = 0; + else if (result & EEH_STATE_RESET_ACTIVE) + args->rets[1] = 1; + else if (!(result & EEH_STATE_RESET_ACTIVE) && + !(result & EEH_STATE_DMA_ENABLED) && + !(result & EEH_STATE_MMIO_ENABLED)) + args->rets[1] = 2; + else if (!(result & EEH_STATE_RESET_ACTIVE) && + (result & EEH_STATE_DMA_ENABLED) && + !(result & EEH_STATE_MMIO_ENABLED)) + args->rets[1] = 4; + else { + args->rets[1] = 5; + args->rets[3] = 1000; + } + + ret = 0; + } else { + pr_warn("%s: Unsupported request\n", + __func__); + ret = -3; + } +out: + return ret; +} + /** * kvmppc_eeh_rtas - Backend for EEH RTAS emulation * @vcpu: KVM virtual CPU @@ -282,6 +356,9 @@ void kvmppc_eeh_rtas(struct kvm_vcpu *vcpu, struct rtas_args *args, int op) case eeh_rtas_set_slot_reset: ret = kvmppc_eeh_set_reset(vcpu, args); break; + case eeh_rtas_read_slot_reset_state2: + ret = kvmppc_eeh_get_state2(vcpu, args); + break; default: pr_warn("%s: Unsupported EEH RTAS service#%d\n", __func__, op);