From patchwork Fri Oct 14 12:40:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 9376687 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 4EA6D60779 for ; Fri, 14 Oct 2016 12:41:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 415BD2A61E for ; Fri, 14 Oct 2016 12:41:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 35C532A63D; Fri, 14 Oct 2016 12:41:27 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD3CF2A61E for ; Fri, 14 Oct 2016 12:41:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753437AbcJNMlY (ORCPT ); Fri, 14 Oct 2016 08:41:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38008 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753369AbcJNMlV (ORCPT ); Fri, 14 Oct 2016 08:41:21 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 564EAC05A288; Fri, 14 Oct 2016 12:41:21 +0000 (UTC) Received: from pxdev.xzpeter.org.com (dhcp-15-192.nay.redhat.com [10.66.15.192]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9ECevGv012346; Fri, 14 Oct 2016 08:41:19 -0400 From: Peter Xu To: kvm@vger.kernel.org Cc: jan.kiszka@web.de, agordeev@redhat.com, drjones@redhat.com, rkrcmar@redhat.com, pbonzini@redhat.com, peterx@redhat.com Subject: [kvm-unit-tests PATCH 08/14] x86: pci: add pci_config_{read|write}[bw]() helpers Date: Fri, 14 Oct 2016 20:40:46 +0800 Message-Id: <1476448852-30062-9-git-send-email-peterx@redhat.com> In-Reply-To: <1476448852-30062-1-git-send-email-peterx@redhat.com> References: <1476448852-30062-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 14 Oct 2016 12:41:21 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP And some cleanup on the file. Signed-off-by: Peter Xu --- lib/x86/asm/pci.h | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/lib/x86/asm/pci.h b/lib/x86/asm/pci.h index cddde41..ce970e4 100644 --- a/lib/x86/asm/pci.h +++ b/lib/x86/asm/pci.h @@ -9,11 +9,42 @@ #include "pci.h" #include "x86/asm/io.h" +#define PCI_HOST_CONFIG_PORT (0xcf8) +#define PCI_HOST_DATA_PORT (0xcfc) + +#define PCI_HOST_INDEX(dev, reg) (reg | (dev << 8) | (0x1 << 31)) + +#define pci_config_readb(dev, reg) (pci_config_read(dev, reg) & 0xff) +#define pci_config_readw(dev, reg) (pci_config_read(dev, reg) & 0xffff) + static inline uint32_t pci_config_read(pcidevaddr_t dev, uint8_t reg) { - uint32_t index = reg | (dev << 8) | (0x1 << 31); - outl(index, 0xCF8); - return inl(0xCFC); + uint32_t index = PCI_HOST_INDEX(dev, reg); + outl(index, PCI_HOST_CONFIG_PORT); + return inl(PCI_HOST_DATA_PORT); +} + +static inline void pci_config_write(pcidevaddr_t dev, uint8_t reg, + uint32_t val) +{ + uint32_t index = PCI_HOST_INDEX(dev, reg); + outl(index, PCI_HOST_CONFIG_PORT); + outl(val, PCI_HOST_DATA_PORT); } +static inline void pci_config_writeb(pcidevaddr_t dev, uint8_t reg, + uint8_t val) +{ + uint32_t index = PCI_HOST_INDEX(dev, reg); + outl(index, PCI_HOST_CONFIG_PORT); + outb(val, PCI_HOST_DATA_PORT); +} + +static inline void pci_config_writew(pcidevaddr_t dev, uint8_t reg, + uint16_t val) +{ + uint32_t index = PCI_HOST_INDEX(dev, reg); + outl(index, PCI_HOST_CONFIG_PORT); + outw(val, PCI_HOST_DATA_PORT); +} #endif