From patchwork Wed Aug 17 12:07:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 9285739 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 B5CB7600CB for ; Wed, 17 Aug 2016 12:07:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0B6D29089 for ; Wed, 17 Aug 2016 12:07:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A50F22908C; Wed, 17 Aug 2016 12:07:52 +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 BA0E32908D for ; Wed, 17 Aug 2016 12:07:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752607AbcHQMHt (ORCPT ); Wed, 17 Aug 2016 08:07:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60826 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751014AbcHQMHr (ORCPT ); Wed, 17 Aug 2016 08:07:47 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (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 5C6B961E58 for ; Wed, 17 Aug 2016 12:07:47 +0000 (UTC) Received: from dhcp-27-118.brq.redhat.com (dhcp-27-122.brq.redhat.com [10.34.27.122]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u7HC7i9j028577; Wed, 17 Aug 2016 08:07:46 -0400 From: Alexander Gordeev To: kvm@vger.kernel.org Cc: Alexander Gordeev , Thomas Huth , Andrew Jones Subject: [kvm-unit-tests PATCH v7 01/13] pci: Fix coding style in generic PCI files Date: Wed, 17 Aug 2016 14:07:02 +0200 Message-Id: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 17 Aug 2016 12:07:47 +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 Cc: Thomas Huth Cc: Andrew Jones Reviewed-by: Andrew Jones Signed-off-by: Alexander Gordeev Reviewed-by: Thomas Huth --- lib/pci.c | 38 ++++++++++++++++++++------------------ lib/pci.h | 3 ++- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/lib/pci.c b/lib/pci.c index 0058d70c888d..43cd0ea4f2fa 100644 --- a/lib/pci.c +++ b/lib/pci.c @@ -10,34 +10,36 @@ /* Scan bus look for a specific device. Only bus 0 scanned for now. */ pcidevaddr_t pci_find_dev(uint16_t vendor_id, uint16_t device_id) { - unsigned dev; - for (dev = 0; dev < 256; ++dev) { - uint32_t id = pci_config_read(dev, 0); - if ((id & 0xFFFF) == vendor_id && (id >> 16) == device_id) { - return dev; - } - } - return PCIDEVADDR_INVALID; + pcidevaddr_t dev; + + for (dev = 0; dev < 256; ++dev) { + uint32_t id = pci_config_read(dev, 0); + + if ((id & 0xFFFF) == vendor_id && (id >> 16) == device_id) + return dev; + } + + return PCIDEVADDR_INVALID; } unsigned long pci_bar_addr(pcidevaddr_t dev, int bar_num) { - uint32_t bar = pci_config_read(dev, PCI_BASE_ADDRESS_0 + bar_num * 4); - if (bar & PCI_BASE_ADDRESS_SPACE_IO) { - return bar & PCI_BASE_ADDRESS_IO_MASK; - } else { - return bar & PCI_BASE_ADDRESS_MEM_MASK; - } + uint32_t bar = pci_config_read(dev, PCI_BASE_ADDRESS_0 + bar_num * 4); + + if (bar & PCI_BASE_ADDRESS_SPACE_IO) + return bar & PCI_BASE_ADDRESS_IO_MASK; + else + return bar & PCI_BASE_ADDRESS_MEM_MASK; } bool pci_bar_is_memory(pcidevaddr_t dev, int bar_num) { - uint32_t bar = pci_config_read(dev, PCI_BASE_ADDRESS_0 + bar_num * 4); - return !(bar & PCI_BASE_ADDRESS_SPACE_IO); + uint32_t bar = pci_config_read(dev, PCI_BASE_ADDRESS_0 + bar_num * 4); + + return !(bar & PCI_BASE_ADDRESS_SPACE_IO); } bool pci_bar_is_valid(pcidevaddr_t dev, int bar_num) { - uint32_t bar = pci_config_read(dev, PCI_BASE_ADDRESS_0 + bar_num * 4); - return bar; + return pci_config_read(dev, PCI_BASE_ADDRESS_0 + bar_num * 4); } diff --git a/lib/pci.h b/lib/pci.h index 9160cfb5950d..54fbf22d634a 100644 --- a/lib/pci.h +++ b/lib/pci.h @@ -12,8 +12,9 @@ typedef uint16_t pcidevaddr_t; enum { - PCIDEVADDR_INVALID = 0xffff, + PCIDEVADDR_INVALID = 0xffff, }; + pcidevaddr_t pci_find_dev(uint16_t vendor_id, uint16_t device_id); unsigned long pci_bar_addr(pcidevaddr_t dev, int bar_num); bool pci_bar_is_memory(pcidevaddr_t dev, int bar_num);