From patchwork Fri Nov 13 17:17:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 544395 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 D405B141435 for ; Sat, 14 Nov 2015 04:18:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932899AbbKMRS2 (ORCPT ); Fri, 13 Nov 2015 12:18:28 -0500 Received: from mga14.intel.com ([192.55.52.115]:64520 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932933AbbKMRRr (ORCPT ); Fri, 13 Nov 2015 12:17:47 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP; 13 Nov 2015 09:17:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,288,1444719600"; d="scan'208";a="819295851" Received: from dcgshare.lm.intel.com ([10.232.118.254]) by orsmga001.jf.intel.com with ESMTP; 13 Nov 2015 09:17:44 -0800 Received: by dcgshare.lm.intel.com (Postfix, from userid 1017) id 5517FE0C6A; Fri, 13 Nov 2015 10:17:44 -0700 (MST) From: Keith Busch To: LKML , x86@kernel.org, linux-pci@vger.kernel.org Cc: Jiang Liu , Thomas Gleixner , Dan Williams , Bjorn Helgaas , Bryan Veal , Ingo Molnar , "H. Peter Anvin" , Martin Mares , Jon Derrick , Keith Busch Subject: [PATCHv5 6/6] pciutils: Allow 32-bit domains Date: Fri, 13 Nov 2015 10:17:37 -0700 Message-Id: <1447435057-5212-7-git-send-email-keith.busch@intel.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1447435057-5212-1-git-send-email-keith.busch@intel.com> References: <1447435057-5212-1-git-send-email-keith.busch@intel.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org PCI-e segments will continue to use the lower 16 bits as required by ACPI. Special domains may use the full 32-bits. Signed-off-by: Keith Busch --- lib/filter.c | 2 +- lib/pci.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/filter.c b/lib/filter.c index d4254a0..075dc2f 100644 --- a/lib/filter.c +++ b/lib/filter.c @@ -45,7 +45,7 @@ pci_filter_parse_slot_v33(struct pci_filter *f, char *str) if (str[0] && strcmp(str, "*")) { long int x = strtol(str, &e, 16); - if ((e && *e) || (x < 0 || x > 0xffff)) + if ((e && *e) || (x < 0)) return "Invalid domain number"; f->domain = x; } diff --git a/lib/pci.h b/lib/pci.h index 10ba831..7e42765 100644 --- a/lib/pci.h +++ b/lib/pci.h @@ -119,7 +119,7 @@ struct pci_param *pci_walk_params(struct pci_access *acc, struct pci_param *prev struct pci_dev { struct pci_dev *next; /* Next device in the chain */ - u16 domain; /* PCI domain (host bridge) */ + int32_t domain; /* PCI domain (host bridge) */ u8 bus, dev, func; /* Bus inside domain, device and function */ /* These fields are set by pci_fill_info() */