From patchwork Sat Apr 4 01:35:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1266326 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; 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.a=rsa-sha256 header.s=20161025 header.b=dATMIOGp; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48vKBj5cBQz9sQt for ; Sat, 4 Apr 2020 12:35:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DB35080720; Sat, 4 Apr 2020 03:35:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dATMIOGp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7D05480363; Sat, 4 Apr 2020 03:35:43 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id AD25B80363 for ; Sat, 4 Apr 2020 03:35:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pj1-x1042.google.com with SMTP id z3so3827576pjr.4 for ; Fri, 03 Apr 2020 18:35:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=/w1bmW5bF0qc5CURhYra0786dGI14GcsiS1lca15NDk=; b=dATMIOGpvAtm3DsFN9HFhAVa1may9L5MspLzDDzEnII3yFrgsXuliumCZI/uL6ousX pygu9/fc4GpYXddGOb/K/9YPbiE3pZ3dmcq4xa6MHK1NeUugJGr5zTOjHqThqZBV99PU 2t2zywM45UAAPTkWW8FX7lHfJuOw1hDGwDjaOmIV7gVPsAHpMDKY1R+YuPofXXtN3WVy NR7b2wOMBQkpxPFu9wHZRO1IBggc1th5el+fprz0kJh+STsITGqv7upMiilyxDc1F2V+ O9PtsBS0jVQgg3l5j4W6WVnrI4CZRZAMGsOGzRGDJA/F5fa4nzu5JoeJ6VXu7rwJhtXi FBcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=/w1bmW5bF0qc5CURhYra0786dGI14GcsiS1lca15NDk=; b=l9euuqClW6lbfxCuXMDjZhT1WRWnIL2NtYwD5GyUn4T9q7xSqVcug6ugi/UHzUmCuu 3LMJ7ntqh3dwSAR+qyiGZOVX/3UQP73k7Tq3HP7Mj0Fsz5vjROplEXZZXZRg5+ifcOg/ tkIg85Zjoy3IIUiFAZFq5wIhKhuiSlowsD90Qx2VAUaE4t6yDBz+gpJAEzgL6ARpl8iL 1ncjd0aYH7qkqrvO8ssNfxluqA1Mq9Vs1lmwjXcRPWQhlqWAiao3+0SKDEKw3zkDAI60 of/vHMjRF7jKf9kwZI3dA6DqMXlZ3YHqtN0yV78u2em7GdDRcylgULeyVyw1Tasq727R REIQ== X-Gm-Message-State: AGi0PubiZ7gqb81jcWXfow7ryfyWvDLoNLa20GjSE3HvvJAnbZ+/7oy/ 5IcPUq+TPy8QupPti/vREds= X-Google-Smtp-Source: APiQypLnuqJLFEs2wZThyJcBwTfZHKgoGkY6x1DZ9FzXBFWilkF5tNVBuybVVCLHIlYmN8ooWzkCBg== X-Received: by 2002:a17:90b:4d09:: with SMTP id mw9mr13412895pjb.101.1585964137951; Fri, 03 Apr 2020 18:35:37 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id u13sm5999896pgp.49.2020.04.03.18.35.37 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 03 Apr 2020 18:35:37 -0700 (PDT) From: Bin Meng To: Simon Glass , Tom Rini , Andy Shevchenko , Wolfgang Wallner , Chee Hong Ang , U-Boot Mailing List Subject: [PATCH v3] serial: ns16550: Fix ordering of getting base address Date: Fri, 3 Apr 2020 18:35:32 -0700 Message-Id: <1585964132-5831-1-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean Currently the driver gets ns16550 base address in the driver probe() routine, which may potentially break any ns16550 wrapper driver that does additional initialization before calling ns16550_serial_probe(). Things are complicated that we need consider ns16550 devices on both simple-bus and PCI bus. To fix the issue we move the base address assignment for simple-bus ns16550 device back to the ofdata_to_platdata(), and assign base address for PCI ns16550 device in ns16550_serial_probe(). This is still not perfect. If any PCI bus based ns16550 wrapper driver tries to access plat->base before calling probe(), it is still subject to break. Fixes: 720f9e1fdb0c9 ("serial: ns16550: Move PCI access from ofdata_to_platdata() to probe()") Reported-by: Andy Shevchenko Signed-off-by: Bin Meng Tested-by: Andy Shevchenko Reviewed-by: Wolfgang Wallner Tested-by: Wolfgang Wallner --- Changes in v3: - extract the base address assignment to a helper Changes in v2: - not to break Fixes, etc to two or more lines in the commit message - add the same CONFIG_SYS_NS16550_PORT_MAPPED ifdefs in the PCI case drivers/serial/ns16550.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index c1b303f..a2f1b35 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -479,39 +479,38 @@ static int ns16550_serial_getinfo(struct udevice *dev, return 0; } -#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) -static int ns1655_serial_set_base_addr(struct udevice *dev) +static int ns16550_serial_assign_base(struct ns16550_platdata *plat, ulong base) { - fdt_addr_t addr; - struct ns16550_platdata *plat; - - plat = dev_get_platdata(dev); - - addr = dev_read_addr_pci(dev); - if (addr == FDT_ADDR_T_NONE) + if (base == FDT_ADDR_T_NONE) return -EINVAL; #ifdef CONFIG_SYS_NS16550_PORT_MAPPED - plat->base = addr; + plat->base = base; #else - plat->base = (unsigned long)map_physmem(addr, 0, MAP_NOCACHE); + plat->base = (unsigned long)map_physmem(base, 0, MAP_NOCACHE); #endif return 0; } -#endif int ns16550_serial_probe(struct udevice *dev) { + struct ns16550_platdata *plat = dev->platdata; struct NS16550 *const com_port = dev_get_priv(dev); struct reset_ctl_bulk reset_bulk; + fdt_addr_t addr; int ret; -#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) - ret = ns1655_serial_set_base_addr(dev); - if (ret) - return ret; -#endif + /* + * If we are on PCI bus, either directly attached to a PCI root port, + * or via a PCI bridge, assign platdata->base before probing hardware. + */ + if (device_is_on_pci_bus(dev)) { + addr = devfdt_get_addr_pci(dev); + ret = ns16550_serial_assign_base(plat, addr); + if (ret) + return ret; + } ret = reset_get_bulk(dev, &reset_bulk); if (!ret) @@ -535,9 +534,15 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev) { struct ns16550_platdata *plat = dev->platdata; const u32 port_type = dev_get_driver_data(dev); + fdt_addr_t addr; struct clk clk; int err; + addr = dev_read_addr(dev); + err = ns16550_serial_assign_base(plat, addr); + if (err && !device_is_on_pci_bus(dev)) + return err; + plat->reg_offset = dev_read_u32_default(dev, "reg-offset", 0); plat->reg_shift = dev_read_u32_default(dev, "reg-shift", 0); plat->reg_width = dev_read_u32_default(dev, "reg-io-width", 1);