From patchwork Wed Apr 5 09:00:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 9663381 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 50FD660353 for ; Wed, 5 Apr 2017 09:03:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A11726E97 for ; Wed, 5 Apr 2017 09:03:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E14C28556; Wed, 5 Apr 2017 09:03:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B321F26E97 for ; Wed, 5 Apr 2017 09:03:48 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cvgol-0000uH-KH; Wed, 05 Apr 2017 09:01:31 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cvgoj-0000u3-Mq for xen-devel@lists.xenproject.org; Wed, 05 Apr 2017 09:01:29 +0000 Received: from [193.109.254.147] by server-7.bemta-6.messagelabs.com id FA/2A-04817-962B4E85; Wed, 05 Apr 2017 09:01:29 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFIsWRWlGSWpSXmKPExsXitHRDpG7ypic RBrMP8lh83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBlXzz5kLdivWHFtimMD4xapLkZODgkBf4nf 2w6wgdhsAjoSF+fuBLI5OEQEVCRu7zUACTML7GCU+PfOCMQWFoiSuNm0mxmkhAWo5MinTJAwr 4ClxIovR5ghJupJvJ34ghHE5hSwkljwdw47iC0EUnPzLRtEvaDEyZlPWCDGa0q0bv/NDmHLSz Rvnc0MUa8o0T/vAdsERr5ZSFpmIWmZhaRlASPzKkaN4tSistQiXUNjvaSizPSMktzEzBxdQwM zvdzU4uLE9NScxKRiveT83E2MwDBjAIIdjF+WBRxilORgUhLlVfB5EiHEl5SfUpmRWJwRX1Sa k1p8iFGGg0NJgpdrI1BOsCg1PbUiLTMHGPAwaQkOHiUR3rINQGne4oLE3OLMdIjUKUZFKXFeV pA+AZBERmkeXBssyi4xykoJ8zICHSLEU5BalJtZgir/ilGcg1FJmDcHZApPZl4J3PRXQIuZgB Y/ufMQZHFJIkJKqoGx/FJIxD3vw5vs732RPPnwel3GLdZrx3uXtyz9t+q6CHNi5PzrhxlE71i vkxJsXniNU/bqtovMoVdDVD3eXVCNX7fq7mne9T3BqR/n5bA8NmLpWb/z8KmEmelmaxXY8tUv L5vLmp7UrCdnoqt1dvG/l0XzdQRPdkbZdfR6/NrYXLb5YO/TapEYJZbijERDLeai4kQA5qWLD q0CAAA= X-Env-Sender: prvs=2610c0db6=roger.pau@citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1491382881!85442366!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10939 invoked from network); 5 Apr 2017 09:01:22 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-8.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 5 Apr 2017 09:01:22 -0000 X-IronPort-AV: E=Sophos;i="5.36,277,1486425600"; d="scan'208";a="417507302" From: Roger Pau Monne To: Date: Wed, 5 Apr 2017 10:00:31 +0100 Message-ID: <20170405090032.20676-2-roger.pau@citrix.com> X-Mailer: git-send-email 2.11.0 (Apple Git-81) In-Reply-To: <20170405090032.20676-1-roger.pau@citrix.com> References: <20170405090032.20676-1-roger.pau@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , julien.grall@arm.com, Paul Durrant , Jan Beulich , Roger Pau Monne Subject: [Xen-devel] [PATCH for-4.9 v3 1/2] x86/io: rename misleading dpci_ prefixed functions to g2m_ X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP The dpci_ prefix used on those IO handlers is misleading, there's nothing PCI specific in them, they simply map a guest IO port into a machine (physical) IO port. They don't specifically trap the PCI IO port range in any way (0xcf8/0xcfc). Rename them to use the g2m_ prefix in order to avoid this confusion. Signed-off-by: Roger Pau MonnĂ© Reviewed-by: Paul Durrant --- Cc: Jan Beulich Cc: Andrew Cooper Cc: Paul Durrant --- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/hvm/io.c | 28 ++++++++++++---------------- xen/include/asm-x86/hvm/io.h | 6 +++++- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 2e76c2345b..b1da2d3dfa 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -649,7 +649,7 @@ int hvm_domain_initialise(struct domain *d) else d->arch.hvm_domain.io_bitmap = hvm_io_bitmap; - register_dpci_portio_handler(d); + register_g2m_portio_handler(d); hvm_ioreq_init(d); diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index 2770ff4fb2..3b3a600983 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -167,8 +167,8 @@ bool handle_pio(uint16_t port, unsigned int size, int dir) return true; } -static bool_t dpci_portio_accept(const struct hvm_io_handler *handler, - const ioreq_t *p) +static bool_t g2m_portio_accept(const struct hvm_io_handler *handler, + const ioreq_t *p) { struct vcpu *curr = current; const struct domain_iommu *dio = dom_iommu(curr->domain); @@ -190,10 +190,8 @@ static bool_t dpci_portio_accept(const struct hvm_io_handler *handler, return 0; } -static int dpci_portio_read(const struct hvm_io_handler *handler, - uint64_t addr, - uint32_t size, - uint64_t *data) +static int g2m_portio_read(const struct hvm_io_handler *handler, + uint64_t addr, uint32_t size, uint64_t *data) { struct hvm_vcpu_io *vio = ¤t->arch.hvm_vcpu.hvm_io; const struct g2m_ioport *g2m_ioport = vio->g2m_ioport; @@ -217,10 +215,8 @@ static int dpci_portio_read(const struct hvm_io_handler *handler, return X86EMUL_OKAY; } -static int dpci_portio_write(const struct hvm_io_handler *handler, - uint64_t addr, - uint32_t size, - uint64_t data) +static int g2m_portio_write(const struct hvm_io_handler *handler, + uint64_t addr, uint32_t size, uint64_t data) { struct hvm_vcpu_io *vio = ¤t->arch.hvm_vcpu.hvm_io; const struct g2m_ioport *g2m_ioport = vio->g2m_ioport; @@ -244,13 +240,13 @@ static int dpci_portio_write(const struct hvm_io_handler *handler, return X86EMUL_OKAY; } -static const struct hvm_io_ops dpci_portio_ops = { - .accept = dpci_portio_accept, - .read = dpci_portio_read, - .write = dpci_portio_write +static const struct hvm_io_ops g2m_portio_ops = { + .accept = g2m_portio_accept, + .read = g2m_portio_read, + .write = g2m_portio_write }; -void register_dpci_portio_handler(struct domain *d) +void register_g2m_portio_handler(struct domain *d) { struct hvm_io_handler *handler = hvm_next_io_handler(d); @@ -258,7 +254,7 @@ void register_dpci_portio_handler(struct domain *d) return; handler->type = IOREQ_TYPE_PIO; - handler->ops = &dpci_portio_ops; + handler->ops = &g2m_portio_ops; } /* diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index d6801c17e0..5ae9225baa 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -148,7 +148,11 @@ void stdvga_deinit(struct domain *d); extern void hvm_dpci_msi_eoi(struct domain *d, int vector); -void register_dpci_portio_handler(struct domain *d); +/* + * HVM port IO handler that performs forwarding of guest IO ports into machine + * IO ports. + */ +void register_g2m_portio_handler(struct domain *d); #endif /* __ASM_X86_HVM_IO_H__ */