From patchwork Thu Aug 4 11:40:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 655766 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3s4p443XyHz9sCy for ; Thu, 4 Aug 2016 21:43:48 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=Koj7o5Fh; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bVH2b-0003WQ-Nr; Thu, 04 Aug 2016 11:42:21 +0000 Received: from mail-lf0-x234.google.com ([2a00:1450:4010:c07::234]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bVH1S-00037b-Ls for linux-arm-kernel@lists.infradead.org; Thu, 04 Aug 2016 11:41:11 +0000 Received: by mail-lf0-x234.google.com with SMTP id l69so180217597lfg.1 for ; Thu, 04 Aug 2016 04:40:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WTHfGOEDw79EeTny/USqbvnm6YRaNqDSsf3xATCfusI=; b=Koj7o5FhfkR1criwF4xJu7Otwv8rglsbSW2D+HJp2Y+iyxDkeKcXnclkGfvhKi2U5l xQsVhsw9AN7YMBrB3lmEvZUEfk1J9smTPxLHY7TNwYUZvPkWJ7yub8ERXGTGFdoYbBnX X9KmIcJr8Z8t7dX+Fnytq3lRbvG8yIr5hCc4c= 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:mime-version:content-transfer-encoding; bh=WTHfGOEDw79EeTny/USqbvnm6YRaNqDSsf3xATCfusI=; b=Cvapid+zegWcp/62MvDOQMMbgZbQDBOM1IQZyvpqxFMvsC0ZVXsUa51hXwCXffaeeV 7dO0A+gC57eSRgrjAc+QA4s5Vf1N7QL2e97nqYCrkgDLlO7wKVa+aFzAOKN569tsxdB4 a/76Y+LeorN4X9ywhwBzNq0fdR4DRUkQIJv0/P1izPJArHOowdVK4lyIGkHp3B4Peaht Nyb3N+10sNedEAAGZyt5mFAjpbGCun9j7sIFJokt0fxWaBj6eYnZTnZDdL45rEvyaHQ4 AO5HYsJBLaBcvqYhqEg7OETZaavDcyuswxvRbdw+Mfr588X4QP5NfNpslNy8kg4xQ+g7 33rg== X-Gm-Message-State: AEkooutBILq7TA9euwuWV8gI11ONLTTFfZQhSxhQEJTJX5Gm8YHDyQsASOJ+GE/7y9GRl0Rt X-Received: by 10.46.0.17 with SMTP id 17mr20861713lja.54.1470310847497; Thu, 04 Aug 2016 04:40:47 -0700 (PDT) Received: from localhost.localdomain (109.59.220.90.mobile.3.dk. [109.59.220.90]) by smtp.gmail.com with ESMTPSA id h9sm2360706lfe.8.2016.08.04.04.40.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Aug 2016 04:40:46 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [PULL 3/8] KVM: irqchip: Convey devid to kvm_set_msi Date: Thu, 4 Aug 2016 13:40:31 +0200 Message-Id: <1470310836-10371-4-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1470310836-10371-1-git-send-email-christoffer.dall@linaro.org> References: <1470310836-10371-1-git-send-email-christoffer.dall@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160804_044110_946002_EED8E709 X-CRM114-Status: GOOD ( 11.28 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:4010:c07:0:0:0:234 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marc Zyngier , Eric Auger , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org From: Eric Auger on ARM, a devid field is populated in kvm_msi struct in case the flag is set to KVM_MSI_VALID_DEVID. Let's propagate both flags and devid field in kvm_kernel_irq_routing_entry. Signed-off-by: Eric Auger Reviewed-by: Andre Przywara Acked-by: Christoffer Dall Acked-by: Radim Krčmář Signed-off-by: Marc Zyngier --- virt/kvm/irqchip.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c index 8db197b..0c00054 100644 --- a/virt/kvm/irqchip.c +++ b/virt/kvm/irqchip.c @@ -62,12 +62,14 @@ 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) || (msi->flags & ~KVM_MSI_VALID_DEVID)) return -EINVAL; route.msi.address_lo = msi->address_lo; route.msi.address_hi = msi->address_hi; route.msi.data = msi->data; + route.msi.flags = msi->flags; + route.msi.devid = msi->devid; return kvm_set_msi(&route, kvm, KVM_USERSPACE_IRQ_SOURCE_ID, 1, false); }