From patchwork Thu Jun 21 06:46:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Kardashevskiy X-Patchwork-Id: 166234 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 D5184B738B for ; Thu, 21 Jun 2012 16:46:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757908Ab2FUGqb (ORCPT ); Thu, 21 Jun 2012 02:46:31 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:54294 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754774Ab2FUGq1 (ORCPT ); Thu, 21 Jun 2012 02:46:27 -0400 Received: by pbbrp8 with SMTP id rp8so1657770pbb.19 for ; Wed, 20 Jun 2012 23:46:27 -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=BKIWmhvjnHXqszAixanYINiLCvQW3eAAI4iLJAZpoFE=; b=O7lc1bYR9fNBZhsuHaY0kzqUSZ6yIY0hi6638lY/nM8o8L4uaFsyJe289tPxU/1qIb sFbsHtRK8do1QpiDvvU3yeP/nH7A284NpecxMjXPYQKiCXRb5M07he0PHDyUMiFTUuy8 +HgmVaOZqRntMuacc3CElONsivjyVtlaSzV27/pQfeMizSyiehdg1ko4obeXHEoFTNGs jGp3Ba/ShiGh6RsHBdk6L4RM/lcKlzBtb8JG+GcJPAWKqal015zDBjGEhAmYd/R4daB+ QiUqqP7WPQNtjfG7RFFik86xejgIbjKVh9T28ffjOJZKH4zV6Lh73pnN0sjgd3PtRCi4 clFg== Received: by 10.68.192.97 with SMTP id hf1mr49246449pbc.132.1340261187355; Wed, 20 Jun 2012 23:46:27 -0700 (PDT) Received: from [10.61.2.175] (ibmaus65.lnk.telstra.net. [165.228.126.9]) by mx.google.com with ESMTPS id of1sm34774769pbb.15.2012.06.20.23.46.25 (version=SSLv3 cipher=OTHER); Wed, 20 Jun 2012 23:46:26 -0700 (PDT) Message-ID: <4FE2C33E.1080808@ozlabs.ru> Date: Thu, 21 Jun 2012 16:46:22 +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 functions to API to set up 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> In-Reply-To: <4FD97A94.2080709@siemens.com> X-Gm-Message-State: ALoCoQnzr8xEjc5PgGa4JINPrkB50Z6F0dj8auJi8CIYhxDBOv13KpY4NllvKkEzpa5ziyg0hp1J Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org Ok, another try. Is it any better now? :) Normally QEMU expects the guest to initialize MSI/MSIX vectors. However on POWER the guest uses RTAS subsystem to configure MSI/MSIX and does not write these vectors to device's config space or MSIX BAR. On the other hand, msi_notify()/msix_notify() write to these vectors to signal the guest about an interrupt so we have to write correct vectors to the devices in order not to change every user of MSI/MSIX. The first aim is to support MSIX for virtio-pci on POWER. There is another patch for POWER coming which introduces a special memory region where MSI/MSIX vectors point to. Signed-off-by: Alexey Kardashevskiy --- hw/msi.c | 14 ++++++++++++++ hw/msi.h | 1 + hw/msix.c | 8 ++++++++ hw/msix.h | 3 +++ 4 files changed, 26 insertions(+) diff --git a/hw/msi.c b/hw/msi.c index 5233204..c7b3e6a 100644 --- a/hw/msi.c +++ b/hw/msi.c @@ -363,3 +363,17 @@ unsigned int msi_nr_vectors_allocated(const PCIDevice *dev) uint16_t flags = pci_get_word(dev->config + msi_flags_off(dev)); return msi_nr_vectors(flags); } + +void msi_set_address_data(PCIDevice *dev, uint64_t address, uint16_t data) +{ + 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), address); + } else { + pci_set_long(dev->config + msi_address_lo_off(dev), address); + } + pci_set_word(dev->config + msi_data_off(dev, msi64bit), data); +} + diff --git a/hw/msi.h b/hw/msi.h index 75747ab..353386e 100644 --- a/hw/msi.h +++ b/hw/msi.h @@ -39,6 +39,7 @@ void msi_reset(PCIDevice *dev); void msi_notify(PCIDevice *dev, unsigned int vector); void msi_write_config(PCIDevice *dev, uint32_t addr, uint32_t val, int len); unsigned int msi_nr_vectors_allocated(const PCIDevice *dev); +void msi_set_address_data(PCIDevice *dev, uint64_t address, uint16_t data); static inline bool msi_present(const PCIDevice *dev) { diff --git a/hw/msix.c b/hw/msix.c index ded3c55..08e773d 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -526,3 +526,11 @@ void msix_unset_vector_notifiers(PCIDevice *dev) dev->msix_vector_use_notifier = NULL; dev->msix_vector_release_notifier = NULL; } +void msix_set_address_data(PCIDevice *dev, int vector, + uint64_t address, uint32_t data) +{ + uint8_t *table_entry = dev->msix_table_page + vector * PCI_MSIX_ENTRY_SIZE; + pci_set_quad(table_entry + PCI_MSIX_ENTRY_LOWER_ADDR, address); + pci_set_long(table_entry + PCI_MSIX_ENTRY_DATA, data); + table_entry[PCI_MSIX_ENTRY_VECTOR_CTRL] &= ~PCI_MSIX_ENTRY_CTRL_MASKBIT; +} diff --git a/hw/msix.h b/hw/msix.h index 50aee82..901f101 100644 --- a/hw/msix.h +++ b/hw/msix.h @@ -35,4 +35,7 @@ int msix_set_vector_notifiers(PCIDevice *dev, MSIVectorUseNotifier use_notifier, MSIVectorReleaseNotifier release_notifier); void msix_unset_vector_notifiers(PCIDevice *dev); +void msix_set_address_data(PCIDevice *dev, int vector, + uint64_t address, uint32_t data); + #endif