From patchwork Tue Nov 19 19:15:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 1197597 X-Patchwork-Delegate: lorenzo.pieralisi@arm.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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=none (p=none dis=none) header.from=glider.be Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47HbBH1M3bz9sPW for ; Wed, 20 Nov 2019 06:15:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726711AbfKSTPN (ORCPT ); Tue, 19 Nov 2019 14:15:13 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:49618 "EHLO xavier.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727243AbfKSTPL (ORCPT ); Tue, 19 Nov 2019 14:15:11 -0500 Received: from ramsan ([84.195.182.253]) by xavier.telenet-ops.be with bizsmtp id TvF62100k5USYZQ01vF6vt; Tue, 19 Nov 2019 20:15:07 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan with esmtp (Exim 4.90_1) (envelope-from ) id 1iX8xu-0008N8-CQ; Tue, 19 Nov 2019 20:15:06 +0100 Received: from geert by rox.of.borg with local (Exim 4.90_1) (envelope-from ) id 1iX8xu-0006ae-9O; Tue, 19 Nov 2019 20:15:06 +0100 From: Geert Uytterhoeven To: Rob Herring , Lorenzo Pieralisi , Bjorn Helgaas Cc: Andrew Murray , Srinath Mannam , Gustavo Pimentel , Marek Vasut , linux-pci@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH] PCI: of: Restore alignment/indentation in host bridge window table Date: Tue, 19 Nov 2019 20:15:05 +0100 Message-Id: <20191119191505.25286-1-geert+renesas@glider.be> X-Mailer: git-send-email 2.17.1 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Since the printing of the inbound resources was added, alignment and indentation of the host bridge window table is broken because of two reasons: 1. The "IB MEM" row header is longer than the other headers, 2. Inbound ranges typically extend beyond 32-bit address space, and thus don't fit in "#010llx". Fix this by extending the row header field to 6 characters, and the format string to 40-bit addresses. Use "%6s" to handle field size and right-alignment, instead of manual preparation using error-prone snprintf() calls. Use the exact same format string for both cases, to allow sharing. Impact on kernel boot log on r8a7791/koelsch: rcar-pcie fe000000.pcie: host bridge /soc/pcie@fe000000 ranges: -rcar-pcie fe000000.pcie: IO 0xfe100000..0xfe1fffff -> 0x00000000 -rcar-pcie fe000000.pcie: MEM 0xfe200000..0xfe3fffff -> 0xfe200000 -rcar-pcie fe000000.pcie: MEM 0x30000000..0x37ffffff -> 0x30000000 -rcar-pcie fe000000.pcie: MEM 0x38000000..0x3fffffff -> 0x38000000 -rcar-pcie fe000000.pcie: IB MEM 0x40000000..0xbfffffff -> 0x40000000 -rcar-pcie fe000000.pcie: IB MEM 0x200000000..0x2ffffffff -> 0x200000000 +rcar-pcie fe000000.pcie: IO 0x00fe100000..0x00fe1fffff -> 0x0000000000 +rcar-pcie fe000000.pcie: MEM 0x00fe200000..0x00fe3fffff -> 0x00fe200000 +rcar-pcie fe000000.pcie: MEM 0x0030000000..0x0037ffffff -> 0x0030000000 +rcar-pcie fe000000.pcie: MEM 0x0038000000..0x003fffffff -> 0x0038000000 +rcar-pcie fe000000.pcie: IB MEM 0x0040000000..0x00bfffffff -> 0x0040000000 +rcar-pcie fe000000.pcie: IB MEM 0x0200000000..0x02ffffffff -> 0x0200000000 Fixes: 52ac576f88f9f701 ("PCI: of: Add inbound resource parsing to helpers") Signed-off-by: Geert Uytterhoeven --- drivers/pci/of.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/pci/of.c b/drivers/pci/of.c index e7e12adcff3a3836..81ceeaa6f1d5a2c5 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -265,7 +265,7 @@ static int devm_of_pci_get_host_bridge_resources(struct device *dev, struct resource *bus_range; struct of_pci_range range; struct of_pci_range_parser parser; - char range_type[4]; + const char *range_type; int err; if (io_base) @@ -299,12 +299,12 @@ static int devm_of_pci_get_host_bridge_resources(struct device *dev, for_each_of_pci_range(&parser, &range) { /* Read next ranges element */ if ((range.flags & IORESOURCE_TYPE_BITS) == IORESOURCE_IO) - snprintf(range_type, 4, " IO"); + range_type = "IO"; else if ((range.flags & IORESOURCE_TYPE_BITS) == IORESOURCE_MEM) - snprintf(range_type, 4, "MEM"); + range_type = "MEM"; else - snprintf(range_type, 4, "err"); - dev_info(dev, " %s %#010llx..%#010llx -> %#010llx\n", + range_type = "err"; + dev_info(dev, " %6s %#012llx..%#012llx -> %#012llx\n", range_type, range.cpu_addr, range.cpu_addr + range.size - 1, range.pci_addr); @@ -359,8 +359,8 @@ static int devm_of_pci_get_host_bridge_resources(struct device *dev, range.cpu_addr == OF_BAD_ADDR || range.size == 0) continue; - dev_info(dev, "IB MEM %#010llx..%#010llx -> %#010llx\n", - range.cpu_addr, + dev_info(dev, " %6s %#012llx..%#012llx -> %#012llx\n", + "IB MEM", range.cpu_addr, range.cpu_addr + range.size - 1, range.pci_addr);