From patchwork Thu Jul 9 08:22:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 6754011 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CB9D0C05AC for ; Thu, 9 Jul 2015 08:23:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F1C58204A0 for ; Thu, 9 Jul 2015 08:23:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2CDC22049C for ; Thu, 9 Jul 2015 08:23:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750986AbbGIIW4 (ORCPT ); Thu, 9 Jul 2015 04:22:56 -0400 Received: from mail-wi0-f179.google.com ([209.85.212.179]:34444 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751093AbbGIIWu (ORCPT ); Thu, 9 Jul 2015 04:22:50 -0400 Received: by wifm2 with SMTP id m2so11066630wif.1 for ; Thu, 09 Jul 2015 01:22:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DR7ICSSgcG1uJ+WnmvOjlTYJBuyNXGqzGm2gwlHqI/0=; b=PUIPy5U/aS4X+u7WwtGAMQg3edIvLCIeIsQvaNPcMx33WD/YyL76AxLfONUZ+Iyu++ 0P1SkerkST3xi8b2jRuwA7yMlJ4LfbUhYcw2QAXT+LGuqVj9lcsuxX+eEqrdY6Ixuflz f/PwNI0yO7CIo/o48GUMcF1mqrBzEYyu9mwN179lwwLEiHLo7EKYyXlvQn5Y3B+oaCaE FSgHsh1/BEao+BUPJPjk4gfAg9MSqeBbXY5kVfS8NFSfubX9gHmMl9MADg40Hb6hbBI4 C8am3JPlyLfcjO9TGAf0zqG2y9daLyfq87UcBzC0W0FRCWoG93srT7vPKcnYl9L6ZeuT 5j1w== X-Gm-Message-State: ALoCoQkqxZrZDvNcHdQndVbI4tWUmUfWhVZSOlPhVE3E4RcFVI8vJPYVWYVx8ULFCZ14qWywVoNd X-Received: by 10.180.78.136 with SMTP id b8mr114952963wix.44.1436430169253; Thu, 09 Jul 2015 01:22:49 -0700 (PDT) Received: from gnx2579.home (LCaen-156-56-7-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id ib9sm7522108wjb.2.2015.07.09.01.22.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Jul 2015 01:22:48 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, linux-arm-kernel@lists.infradead.org, marc.zyngier@arm.com, christoffer.dall@linaro.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: patches@linaro.org, andre.przywara@arm.com, p.fedin@samsung.com, pbonzini@redhat.com Subject: [PATCH v2 3/7] KVM: irqchip: convey devid to kvm_set_msi Date: Thu, 9 Jul 2015 10:22:13 +0200 Message-Id: <1436430137-24205-4-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436430137-24205-1-git-send-email-eric.auger@linaro.org> References: <1436430137-24205-1-git-send-email-eric.auger@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 on ARM, a devid field is populated in kvm_msi struct in case the flag is set to KVM_MSI_VALID_DEVID. Let's populate the corresponding kvm_kernel_irq_routing_entry devid field and set the msi type to KVM_IRQ_ROUTING_EXTENDED_MSI. Signed-off-by: Eric Auger --- virt/kvm/irqchip.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c index 21c1424..e678f8a 100644 --- a/virt/kvm/irqchip.c +++ b/virt/kvm/irqchip.c @@ -72,9 +72,17 @@ int kvm_send_userspace_msi(struct kvm *kvm, struct kvm_msi *msi) { struct kvm_kernel_irq_routing_entry route; - if (!irqchip_in_kernel(kvm) || msi->flags != 0) + if (!irqchip_in_kernel(kvm)) return -EINVAL; + if (msi->flags & KVM_MSI_VALID_DEVID) { + route.devid = msi->devid; + route.type = KVM_IRQ_ROUTING_EXTENDED_MSI; + } else if (!msi->flags) + return -EINVAL; + + /* historically the route.type was not set */ + route.msi.address_lo = msi->address_lo; route.msi.address_hi = msi->address_hi; route.msi.data = msi->data;