From patchwork Tue Nov 29 04:25: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: 9450921 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 2078D60756 for ; Tue, 29 Nov 2016 04:27:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1B5CC27F46 for ; Tue, 29 Nov 2016 04:27:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 105C527FBE; Tue, 29 Nov 2016 04:27:57 +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 9CD1327F95 for ; Tue, 29 Nov 2016 04:27:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933000AbcK2E1y (ORCPT ); Mon, 28 Nov 2016 23:27:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47964 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933033AbcK2E1m (ORCPT ); Mon, 28 Nov 2016 23:27:42 -0500 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 5A7DA61BB5; Tue, 29 Nov 2016 04:27:41 +0000 (UTC) Received: from pxdev.xzpeter.org (vpn1-7-237.pek2.redhat.com [10.72.7.237]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uAT4PrdT015727; Mon, 28 Nov 2016 23:27:37 -0500 From: Peter Xu To: kvm@vger.kernel.org Cc: drjones@redhat.com, agordeev@redhat.com, jan.kiszka@web.de, rkrcmar@redhat.com, pbonzini@redhat.com, peterx@redhat.com Subject: [PATCH v7 10/14] pci: provide pci_enable_defaults() Date: Tue, 29 Nov 2016 12:25:46 +0800 Message-Id: <1480393550-12385-11-git-send-email-peterx@redhat.com> In-Reply-To: <1480393550-12385-1-git-send-email-peterx@redhat.com> References: <1480393550-12385-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.39]); Tue, 29 Nov 2016 04:27:41 +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 One helper function to set/clear specific bit in PCI_COMMAND register is introduced. Then, provide a function to do most of the common PCI init work. Suggested-by: Andrew Jones Reviewed-by: Andrew Jones Signed-off-by: Peter Xu --- lib/pci.c | 19 +++++++++++++++++++ lib/pci.h | 2 ++ 2 files changed, 21 insertions(+) diff --git a/lib/pci.c b/lib/pci.c index d4521be..bf2a3df 100644 --- a/lib/pci.c +++ b/lib/pci.c @@ -7,6 +7,18 @@ #include "pci.h" #include "asm/pci.h" +void pci_cmd_set_clr(struct pci_dev *dev, uint16_t set, uint16_t clr) +{ + uint16_t val = pci_config_readw(dev->bdf, PCI_COMMAND); + + /* No overlap is allowed */ + assert((set & clr) == 0); + val |= set; + val &= ~clr; + + pci_config_writew(dev->bdf, PCI_COMMAND, val); +} + bool pci_dev_exists(pcidevaddr_t dev) { return (pci_config_readw(dev, PCI_VENDOR_ID) != 0xffff && @@ -242,3 +254,10 @@ void pci_scan_bars(struct pci_dev *dev) } } } + +void pci_enable_defaults(struct pci_dev *dev) +{ + pci_scan_bars(dev); + /* Enable device DMA operations */ + pci_cmd_set_clr(dev, PCI_COMMAND_MASTER, 0); +} diff --git a/lib/pci.h b/lib/pci.h index 8215c9d..d3052ef 100644 --- a/lib/pci.h +++ b/lib/pci.h @@ -25,6 +25,8 @@ struct pci_dev { extern void pci_dev_init(struct pci_dev *dev, pcidevaddr_t bdf); extern void pci_scan_bars(struct pci_dev *dev); +extern void pci_cmd_set_clr(struct pci_dev *dev, uint16_t set, uint16_t clr); +extern void pci_enable_defaults(struct pci_dev *dev); extern bool pci_probe(void); extern void pci_print(void);