From patchwork Thu Jun 21 07:18:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Kardashevskiy X-Patchwork-Id: 166238 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D8DA6B6F9F for ; Thu, 21 Jun 2012 17:18:26 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758442Ab2FUHSZ (ORCPT ); Thu, 21 Jun 2012 03:18:25 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:53480 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758376Ab2FUHSY (ORCPT ); Thu, 21 Jun 2012 03:18:24 -0400 Received: by yenl2 with SMTP id l2so207711yen.19 for ; Thu, 21 Jun 2012 00:18:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=tHpp90odwmhri277GFankK1/icvB2pJlvSxQpxuxt/Q=; b=msoiPROIEMh1PLRlnvo5mrtJxXYAqjTODQcpFiISgfBb1Dklu+vGO9eVIa3jhBa5ka y25pcHyscjvtxbkmbaA3S3zVGOahNk2NDtdduZx/Wj94uDCBwahDQ+dX3aXsuUm2yBN6 DUxRS6SX4N07+idT66AgFFPpkeVXH3nZ5rOhqZd9XXjwuX3pQs17+JGTey5tJjqMncWg dsQxOgwE42JhhS9y07KF72mqf8EBlbp5SOYlgHrM/4JtfyWpgb7+O7fxyLYnEfguy9CI 1SroWH66MvVPr5F2llqkji4ECNv+uVrDLdzVYJ1Kq+ga42XvOiFRj6I9bkQUjK5MuJBc h7Sg== Received: by 10.50.156.228 with SMTP id wh4mr6616007igb.47.1340263103757; Thu, 21 Jun 2012 00:18:23 -0700 (PDT) Received: from [10.61.2.175] (ibmaus65.lnk.telstra.net. [165.228.126.9]) by mx.google.com with ESMTPS id k6sm17173227igz.9.2012.06.21.00.18.21 (version=SSLv3 cipher=OTHER); Thu, 21 Jun 2012 00:18:23 -0700 (PDT) Message-ID: <4FE2CABB.4070203@ozlabs.ru> Date: Thu, 21 Jun 2012 17:18:19 +1000 From: Alexey Kardashevskiy User-Agent: Mozilla/5.0 (X11; Linux i686; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 MIME-Version: 1.0 To: Jan Kiszka CC: Alex Williamson , "qemu-devel@nongnu.org" , "kvm-ppc@vger.kernel.org" Subject: [PATCH] msi/msix: added public API to set/get MSI message address, and data References: <4FD968BB.2000505@ozlabs.ru> <4FD9693E.2090508@ozlabs.ru> <1339649800.24818.3.camel@ul30vt> <4FD973F7.7080207@ozlabs.ru> <4FD97A94.2080709@siemens.com> <4FE2C33E.1080808@ozlabs.ru> <4FE2C4DA.40403@siemens.com> In-Reply-To: <4FE2C4DA.40403@siemens.com> X-Gm-Message-State: ALoCoQm62FJ8GUs4JzoPHnUAnc4+h1Ob+xA8a1442FNPkieCbssGARHHRJhomQldzxURGVY1lCLc Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org agrhhh. sha1 of the patch changed after rebasing :) Added (msi|msix)_(set|get)_message() function for whoever might want to use them. Currently msi_notify()/msix_notify() write to these vectors to signal the guest about an interrupt so the correct values have to written there by the guest or QEMU. For example, POWER guest never initializes MSI/MSIX vectors, instead it uses RTAS hypercalls. So in order to support MSIX for virtio-pci on POWER we have to initialize MSI/MSIX message from QEMU. As only set* function are required by now, the "get" functions were added or made public for a symmetry. Signed-off-by: Alexey Kardashevskiy --- hw/msi.c | 29 +++++++++++++++++++++++++++++ hw/msi.h | 2 ++ hw/msix.c | 11 ++++++++++- hw/msix.h | 3 +++ 4 files changed, 44 insertions(+), 1 deletion(-) diff --git a/hw/msi.c b/hw/msi.c index 5233204..9ad84a4 100644 --- a/hw/msi.c +++ b/hw/msi.c @@ -105,6 +105,35 @@ static inline uint8_t msi_pending_off(const PCIDevice* dev, bool msi64bit) return dev->msi_cap + (msi64bit ? PCI_MSI_PENDING_64 : PCI_MSI_PENDING_32); } +MSIMessage msi_get_message(PCIDevice *dev) +{ + uint16_t flags = pci_get_word(dev->config + msi_flags_off(dev)); + bool msi64bit = flags & PCI_MSI_FLAGS_64BIT; + MSIMessage msg; + + if (msi64bit) { + msg.address = pci_get_quad(dev->config + msi_address_lo_off(dev)); + } else { + msg.address = pci_get_long(dev->config + msi_address_lo_off(dev)); + } + msg.data = pci_get_word(dev->config + msi_data_off(dev, msi64bit)); + + return msg; +} + +void msi_set_message(PCIDevice *dev, MSIMessage msg) +{ + uint16_t flags = pci_get_word(dev->config + msi_flags_off(dev)); + bool msi64bit = flags & PCI_MSI_FLAGS_64BIT; + + if (msi64bit) { + pci_set_quad(dev->config + msi_address_lo_off(dev), msg.address); + } else { + pci_set_long(dev->config + msi_address_lo_off(dev), msg.address); + } + pci_set_word(dev->config + msi_data_off(dev, msi64bit), msg.data); +} + bool msi_enabled(const PCIDevice *dev) { return msi_present(dev) && diff --git a/hw/msi.h b/hw/msi.h index 75747ab..4b0f4f8 100644 --- a/hw/msi.h +++ b/hw/msi.h @@ -31,6 +31,8 @@ struct MSIMessage { extern bool msi_supported; +MSIMessage msi_get_message(PCIDevice *dev); +void msi_set_message(PCIDevice *dev, MSIMessage msg); bool msi_enabled(const PCIDevice *dev); int msi_init(struct PCIDevice *dev, uint8_t offset, unsigned int nr_vectors, bool msi64bit, bool msi_per_vector_mask); diff --git a/hw/msix.c b/hw/msix.c index ded3c55..9e8d8bb 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -35,7 +35,7 @@ #define MSIX_PAGE_PENDING (MSIX_PAGE_SIZE / 2) #define MSIX_MAX_ENTRIES 32 -static MSIMessage msix_get_message(PCIDevice *dev, unsigned vector) +MSIMessage msix_get_message(PCIDevice *dev, unsigned vector) { uint8_t *table_entry = dev->msix_table_page + vector * PCI_MSIX_ENTRY_SIZE; MSIMessage msg; @@ -45,6 +45,15 @@ static MSIMessage msix_get_message(PCIDevice *dev, unsigned vector) return msg; } +void msix_set_message(PCIDevice *dev, int vector, struct MSIMessage msg) +{ + uint8_t *table_entry = dev->msix_table_page + vector * PCI_MSIX_ENTRY_SIZE; + + pci_set_quad(table_entry + PCI_MSIX_ENTRY_LOWER_ADDR, msg.address); + pci_set_long(table_entry + PCI_MSIX_ENTRY_DATA, msg.data); + table_entry[PCI_MSIX_ENTRY_VECTOR_CTRL] &= ~PCI_MSIX_ENTRY_CTRL_MASKBIT; +} + /* Add MSI-X capability to the config space for the device. */ /* Given a bar and its size, add MSI-X table on top of it * and fill MSI-X capability in the config space. diff --git a/hw/msix.h b/hw/msix.h index 50aee82..3374cf8 100644 --- a/hw/msix.h +++ b/hw/msix.h @@ -4,6 +4,9 @@ #include "qemu-common.h" #include "pci.h" +MSIMessage msix_get_message(PCIDevice *dev, unsigned vector); +void msix_set_message(PCIDevice *dev, int vector, MSIMessage msg); + int msix_init(PCIDevice *pdev, unsigned short nentries, MemoryRegion *bar, unsigned bar_nr, unsigned bar_size);