From patchwork Wed Jan 10 10:34:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Jorge Ramirez-Ortiz, Gmail" X-Patchwork-Id: 124043 Delivered-To: patch@linaro.org Received: by 10.80.140.226 with SMTP id r31csp1493357edr; Wed, 10 Jan 2018 02:42:58 -0800 (PST) X-Google-Smtp-Source: ACJfBotN4IxcAgdNd+Nc0nlPTJ2Be9M+h+MRtJkQi62fd4Cm2CHgqghZfBTWKaNRkskf5q5ALLCZ X-Received: by 10.80.149.246 with SMTP id x51mr25467826eda.74.1515580978051; Wed, 10 Jan 2018 02:42:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515580978; cv=none; d=google.com; s=arc-20160816; b=meWTnOLAmVAkazqaWMN0otKtS/LGn9/IqlSCSZ0RTFrnxwgziP4TmPr2t21lIiarFA 5fAtZk+RsMEgK0j2+qytWANdr0k56lpF+bJ+ImkIPzSCu2q5epqa3zJE3+1OAk5/PJce 7WUYI/vrNcB1L3T5xnf+M1JuRYdAL0jkxW03C4ltuFtmiLqKpx8dIu7Gzmt80Rt6dibn U0b1/+V4Glw3em9m2S/IzUC4qOk0Q3KZNHEQWYrhsMGCnYyS9u0G9u50A1ftazEtDRlm u7Bx5gtsEBaxqkJ4+IsFDYQ0rmJrEI/C8AdAyp28/jrk69kiUgYdKB3Zlb7XVJRpHprP Ubyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:arc-authentication-results; bh=snVE2K6v7Rq4JZiSNZljGifKRtFup3YGF27L8A8AqYw=; b=ILwu9O3OZXvGhuHIFkiIPH31vLajfzKVmkT/lHxkw4L9Bxu9eH5yOVc0jn5wpcnQPs 39UlFZeyIlqMMZPNxi2ZTMATm4JAzNEYbYXzAGAg71KNXNVmhbsjXKvu1rfYAkD3TYN0 jDDGq+MoU24i1V+o/gbBeL4wLfTexM1qB4s7tm/gBZpwcmIqC4idJW2uB0nZ3jYKbO7/ tuea5cLJELg+18ZbSiOvEDzKnRx4MH65198n+Ttv+aG5B29gZeJHXNGDlKZ7ZHKfMhFV 7sxEOUhBu6wUE3SmLomgEZfhl2Atu2pi6Ru6sxpyhC4poOJK592l3lADJjO0dMpePzZL t30A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=a1TPtFMR; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id m13si2528501edi.403.2018.01.10.02.42.57; Wed, 10 Jan 2018 02:42:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=a1TPtFMR; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: by lists.denx.de (Postfix, from userid 105) id 9D0DAC22131; Wed, 10 Jan 2018 10:41:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id EF39AC22180; Wed, 10 Jan 2018 10:36:38 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6999EC2214F; Wed, 10 Jan 2018 10:34:57 +0000 (UTC) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by lists.denx.de (Postfix) with ESMTPS id A76E3C2211E for ; Wed, 10 Jan 2018 10:34:50 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id 123so4730922wme.0 for ; Wed, 10 Jan 2018 02:34:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=2rJmnEp+Dw7SDcd3SVoooiF72aa9i5MVlX23Oo6J+3U=; b=a1TPtFMRNSjcBGitqnILSPv2oC3orBH3T0XPbAwK3VIwTPTN0svDQ5HsJjSd7uOAPT 8PbPb82Ob3wdRncyz3cecwtu2dKkexan8gZy7xOmeCvrmX4FGLxNINCqrJsNT/hq8ZFv MYRf+9BF+SdHp71xBT5AhgHiHfiSUxYtBCwDclOhBidYj5cUF6OctZIijnlAjSLlwELj DobV6WA6mHOh6UpHx+O3JoybEBb9JrhL3HZHLcHFac4X7xNotbSyIRjBuHhO5z3PFqrd OP4EqGzTBMQDrngem3S3b76QYE9+YnMBjt9F7ckAl4pLikXLPbticFIoZ0imDGBlTqaj aA3g== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=2rJmnEp+Dw7SDcd3SVoooiF72aa9i5MVlX23Oo6J+3U=; b=PLlVwpKbphMmezFT6Ho6zEolITApJEMVsUNpOPnS+N+yDwH7hPhJpI+1IX4vXFY5Fg 5cYi7rNoWQvi3LgO7LUtjmjboHTwSNvWzLjqyEfQM9udxh/iyuhLZoJIFhZcTeqDtAxa /ZSi85SMwpQbQhHOdpIpE5WkMzOPtvDKeWXbZ6l5aBn+lnDbgVC2aPsZGNR9JKtdXQSa cmtNYnVVSAQGEryYuEjwYsUhDp2C7pHb77njswtYFcgpfr+YH2pKE5rAw7REuzWE5cjD /UH0WSDtX5dQ4ZgU0H6lanymwc9ShvU2BxIhwa9smaz7IMPRnJqZGc++UlgwLXBXzOej N+Ng== X-Gm-Message-State: AKGB3mIHtHJKLniHArg31a/5tDQOPhVG7zhqSFNLQjrURjx1bUmCSxKQ PICYYuIymvulu5CbFIaRiHKnuQ== X-Received: by 10.28.159.209 with SMTP id i200mr14542299wme.101.1515580489987; Wed, 10 Jan 2018 02:34:49 -0800 (PST) Received: from igloo.80.58.61.254 (141.pool85-51-114.dynamic.orange.es. [85.51.114.141]) by smtp.gmail.com with ESMTPSA id i33sm21484737wri.90.2018.01.10.02.34.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Jan 2018 02:34:49 -0800 (PST) From: Jorge Ramirez-Ortiz To: u-boot@lists.denx.de Date: Wed, 10 Jan 2018 11:34:35 +0100 Message-Id: <1515580480-26075-2-git-send-email-jorge.ramirez.ortiz@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515580480-26075-1-git-send-email-jorge.ramirez.ortiz@gmail.com> References: <1515580480-26075-1-git-send-email-jorge.ramirez.ortiz@gmail.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v1 02/07] db410c: update wlan and bt mac addresses from firmware X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" From: Jorge Ramirez-Ortiz The firmware that runs before u-boot modifies u-boot's device tree adding the local-mac-address and local-bd-address properties for the compatibles "qcom,wcnss-bt" and "qcom,wcnss-wlan". This commit reads that firmware, retrieves the properties and fixups the device tree that is passed to the kernel before booting. Signed-off-by: Jorge Ramirez-Ortiz --- arch/arm/dts/dragonboard410c.dts | 10 +++++ board/qualcomm/dragonboard410c/Makefile | 1 + board/qualcomm/dragonboard410c/dragonboard410c.c | 49 +++++++++++++++++++++--- board/qualcomm/dragonboard410c/lowlevel_init.S | 28 ++++++++++++++ configs/dragonboard410c_defconfig | 3 ++ 5 files changed, 85 insertions(+), 6 deletions(-) create mode 100644 board/qualcomm/dragonboard410c/lowlevel_init.S diff --git a/arch/arm/dts/dragonboard410c.dts b/arch/arm/dts/dragonboard410c.dts index 7746622..25aeac4 100644 --- a/arch/arm/dts/dragonboard410c.dts +++ b/arch/arm/dts/dragonboard410c.dts @@ -86,6 +86,16 @@ clock-frequency = <200000000>; }; + wcnss { + bt { + compatible="qcom,wcnss-bt"; + }; + + wifi { + compatible="qcom,wcnss-wlan"; + }; + }; + spmi@200f000 { compatible = "qcom,spmi-pmic-arb"; reg = <0x200f800 0x200 0x2400000 0x400000 0x2c00000 0x400000>; diff --git a/board/qualcomm/dragonboard410c/Makefile b/board/qualcomm/dragonboard410c/Makefile index cd67808..5082383 100644 --- a/board/qualcomm/dragonboard410c/Makefile +++ b/board/qualcomm/dragonboard410c/Makefile @@ -5,4 +5,5 @@ # obj-y := dragonboard410c.o +obj-y += lowlevel_init.o extra-y += head.o diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c index 848e278..99fc91b 100644 --- a/board/qualcomm/dragonboard410c/dragonboard410c.c +++ b/board/qualcomm/dragonboard410c/dragonboard410c.c @@ -10,9 +10,16 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; +/* pointer to the device tree ammended by the firmware */ +extern const void *fw_dtb; + +static char wlan_mac[ARP_HLEN]; +static char bt_mac[ARP_HLEN]; + int dram_init(void) { gd->ram_size = PHYS_SDRAM_1_SIZE; @@ -27,7 +34,6 @@ int dram_init_banksize(void) return 0; } - int board_prepare_usb(enum usb_init_type type) { static struct udevice *pmic_gpio; @@ -96,11 +102,6 @@ int board_prepare_usb(enum usb_init_type type) return 0; } -int board_init(void) -{ - return 0; -} - /* Check for vol- button - if pressed - stop autoboot */ int misc_init_r(void) { @@ -134,3 +135,39 @@ int misc_init_r(void) return 0; } + +int board_init(void) +{ + int offset, len; + const char *mac; + + /* take a copy of the firmware information (the user could unknownly + overwrite that DDR via tftp or other means) */ + + offset = fdt_node_offset_by_compatible(fw_dtb, -1, "qcom,wcnss-wlan"); + if (offset >= 0) { + mac = fdt_getprop(fw_dtb, offset, "local-mac-address", &len); + if (mac) + memcpy(wlan_mac, mac, ARP_HLEN); + } + + offset = fdt_node_offset_by_compatible(fw_dtb, -1, "qcom,wcnss-bt"); + if (offset >= 0) { + mac = fdt_getprop(fw_dtb, offset, "local-bd-address", &len); + if (mac) + memcpy(bt_mac, mac, ARP_HLEN); + } + + return 0; +} + +int ft_board_setup(void *blob, bd_t *bd) +{ + do_fixup_by_compat(blob, "qcom,wcnss-wlan", "local-mac-address", + wlan_mac, ARP_HLEN, 1); + + do_fixup_by_compat(blob, "qcom,wcnss-bt", "local-bd-address", + bt_mac, ARP_HLEN, 1); + + return 0; +} diff --git a/board/qualcomm/dragonboard410c/lowlevel_init.S b/board/qualcomm/dragonboard410c/lowlevel_init.S new file mode 100644 index 0000000..15b2d0c --- /dev/null +++ b/board/qualcomm/dragonboard410c/lowlevel_init.S @@ -0,0 +1,28 @@ +/* + * (C) Copyright 2016 + * Cédric Schieli + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include + +.align 8 +.global fw_dtb +fw_dtb: + .dword 0x0 + +/* + * Routine: save_boot_params (called after reset from start.S) + * Description: save ATAG/FDT address provided by the firmware at boot time + */ + +.global save_boot_params +save_boot_params: + + /* The firmware provided ATAG/FDT address can be found in r2/x0 */ + adr x8, fw_dtb + str x0, [x8] + + /* Returns */ + b save_boot_params_ret diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig index b71bff7..cfe9be9 100644 --- a/configs/dragonboard410c_defconfig +++ b/configs/dragonboard410c_defconfig @@ -44,3 +44,6 @@ CONFIG_USB_ETHER_ASIX88179=y CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_OF_CONTROL=y +CONFIG_ENV_IS_IN_MMC=y +CONFIG_OF_BOARD_SETUP=y