From patchwork Mon Nov 19 13:14:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sundeep subbaraya X-Patchwork-Id: 999805 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="N3HfptXm"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42z8Ss0VHNz9s7T for ; Tue, 20 Nov 2018 00:14:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729212AbeKSXi1 (ORCPT ); Mon, 19 Nov 2018 18:38:27 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:35870 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729206AbeKSXi1 (ORCPT ); Mon, 19 Nov 2018 18:38:27 -0500 Received: by mail-pg1-f193.google.com with SMTP id n2so6663980pgm.3; Mon, 19 Nov 2018 05:14:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=e3Pj93xwDziUfCLYZA8z/gIW8uhQTOtI9EtGqdEtiik=; b=N3HfptXm9Rq7D9f3i8h66UVzUzRI106KSVgAJU/AQ/rUZ5vfCbHpbH4zTVSYVqJRtv CuV4iQfGPhD2DRBKmbq5mJbXBPCSY4lJC8y1+Yzls6muGXvEjBOIWJC+2yXauxVeJ8e1 5btaDJaF1RHz4AcoHPJG9KW9tanY6v+eoyfRSFyCmK2oH+RZeazqSK1JhCIRfXmzaRWC 1sChG+TbxVPqe4EULuujhdj+G3Hy5xtJBD19N2Em5H/pVDPHivAm+v7q9VT+kn4zwIEm ZFxIX+p5uegvtSm3wcYGiqazHW5m0H3gR/kP73HgnZKyu/g/l+A5IeoI6jGv4jMHQQJu +OKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=e3Pj93xwDziUfCLYZA8z/gIW8uhQTOtI9EtGqdEtiik=; b=hu6521Uyyt2JzXpoA6EZFhVSTEo3wyqNSQUro5KcUuj1ZzHidnJypZdY4hlOa3skc6 BND3P5Ju804gPtWR0QNPGyzHOb1fSJ/w7C9aKRpcGvnYJKjI/mHhtt1RQ1mYQEhsdFIH klEtLWloxznxlHlTHLFIvIT2B1izkTQb1d0PW+ZNj5bEKAFa7X4pk4CrbYRf2XemwNCx 9TEGB8+w+rQTkkDJdSI4ei7JlZVZgI6B0cjkHt92OBN4piu5HU10Hm4CJKHhxPVNGJHr Mkj7Mt5At++wp4yDKFqQ6XmOAH7BBtv8/J7R/+JXTOi9m23YcEoyo3RXGNJJsfrHcJr5 1RXQ== X-Gm-Message-State: AGRZ1gKxeonLDrXe6z0zoYh2mgptMLd3qRlURok3SfR6ZCv9rNfKmop3 2cdg2jaYhfrnJaIEfLSUDW8= X-Google-Smtp-Source: AJdET5f22l+STo/saIwqp/nWFLhLfWezAHvUC/Jmphs+Q/nUFUXnHeGuS8SXf9J4jGFP6zyt5NH+gw== X-Received: by 2002:a62:3a04:: with SMTP id h4mr22724521pfa.119.1542633291060; Mon, 19 Nov 2018 05:14:51 -0800 (PST) Received: from hyd1358.caveonetworks.com. ([115.113.156.2]) by smtp.googlemail.com with ESMTPSA id z83-v6sm53649048pfi.4.2018.11.19.05.14.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Nov 2018 05:14:50 -0800 (PST) From: sundeep.lkml@gmail.com To: bhelgaas@google.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, sean.stalley@intel.com Cc: sgoutham@marvell.com, Subbaraya Sundeep Subject: [PATCH v2] PCI: assign bus numbers present in EA capability for bridges Date: Mon, 19 Nov 2018 18:44:32 +0530 Message-Id: <1542633272-16161-1-git-send-email-sundeep.lkml@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Subbaraya Sundeep As per the spec, bridges with EA capability work with fixed secondary and subordinate bus numbers. Hence assign bus numbers to bridges from EA if the capability exists. Signed-off-by: Subbaraya Sundeep --- Changes for v2: No changes just added Sean Stalley who did EA support for BARs. drivers/pci/probe.c | 58 ++++++++++++++++++++++++++++++++++++++++--- include/uapi/linux/pci_regs.h | 6 +++++ 2 files changed, 60 insertions(+), 4 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index b1c05b5..f41d2e6 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1030,6 +1030,40 @@ static void pci_enable_crs(struct pci_dev *pdev) static unsigned int pci_scan_child_bus_extend(struct pci_bus *bus, unsigned int available_buses); +/* + * pci_ea_fixed_busnrs() - Read fixed Secondary and Subordinate bus + * numbers from EA capability. + * @dev: Bridge with EA + * @secondary: updated with secondary bus number in EA + * @subordinate: updated with subordinate bus number in EA + * + * If it is a bridge with EA capability then fixed bus numbers are + * read from EA capability list and secondary, subordinate reference + * variables will be updated. Otherwise secondary and subordinate reference + * variables will be zeroed. + */ +static void pci_ea_fixed_busnrs(struct pci_dev *dev, u8 *secondary, + u8 *subordinate) +{ + int ea; + int offset; + u32 dw; + + *secondary = *subordinate = 0; + + if (dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) + return; + + /* find PCI EA capability in list */ + ea = pci_find_capability(dev, PCI_CAP_ID_EA); + if (!ea) + return; + + offset = ea + PCI_EA_FIRST_ENT; + pci_read_config_dword(dev, offset, &dw); + *secondary = dw & PCI_EA_SEC_BUS_MASK; + *subordinate = (dw & PCI_EA_SUB_BUS_MASK) >> PCI_EA_SUB_BUS_SHIFT; +} /* * pci_scan_bridge_extend() - Scan buses behind a bridge @@ -1064,6 +1098,8 @@ static int pci_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev, u16 bctl; u8 primary, secondary, subordinate; int broken = 0; + u8 fixed_sec, fixed_sub; + int next_busnr; /* * Make sure the bridge is powered on to be able to access config @@ -1163,17 +1199,25 @@ static int pci_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev, /* Clear errors */ pci_write_config_word(dev, PCI_STATUS, 0xffff); + /* read bus numbers from EA */ + pci_ea_fixed_busnrs(dev, &fixed_sec, &fixed_sub); + + next_busnr = max + 1; + /* Use secondary bus number in EA */ + if (fixed_sec) + next_busnr = fixed_sec; + /* * Prevent assigning a bus number that already exists. * This can happen when a bridge is hot-plugged, so in this * case we only re-scan this bus. */ - child = pci_find_bus(pci_domain_nr(bus), max+1); + child = pci_find_bus(pci_domain_nr(bus), next_busnr); if (!child) { - child = pci_add_new_bus(bus, dev, max+1); + child = pci_add_new_bus(bus, dev, next_busnr); if (!child) goto out; - pci_bus_insert_busn_res(child, max+1, + pci_bus_insert_busn_res(child, next_busnr, bus->busn_res.end); } max++; @@ -1234,7 +1278,13 @@ static int pci_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev, max += i; } - /* Set subordinate bus number to its real value */ + /* + * Set subordinate bus number to its real value. + * If fixed subordinate bus number exists from EA + * capability then use it. + */ + if (fixed_sub) + max = fixed_sub; pci_bus_update_busn_res_end(child, max); pci_write_config_byte(dev, PCI_SUBORDINATE_BUS, max); } diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h index e1e9888..c3d0904 100644 --- a/include/uapi/linux/pci_regs.h +++ b/include/uapi/linux/pci_regs.h @@ -372,6 +372,12 @@ #define PCI_EA_FIRST_ENT_BRIDGE 8 /* First EA Entry for Bridges */ #define PCI_EA_ES 0x00000007 /* Entry Size */ #define PCI_EA_BEI 0x000000f0 /* BAR Equivalent Indicator */ + +/* EA fixed Secondary and Subordinate bus numbers for Bridge */ +#define PCI_EA_SEC_BUS_MASK 0xff +#define PCI_EA_SUB_BUS_MASK 0xff00 +#define PCI_EA_SUB_BUS_SHIFT 8 + /* 0-5 map to BARs 0-5 respectively */ #define PCI_EA_BEI_BAR0 0 #define PCI_EA_BEI_BAR5 5