From patchwork Thu Dec 14 13:27:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jorge Ramirez-Ortiz X-Patchwork-Id: 121936 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp6809067qgn; Thu, 14 Dec 2017 05:31:43 -0800 (PST) X-Google-Smtp-Source: ACJfBovJAuaAv341FSxCqsvk+1Hy1Uo52bk7k7oJ2xMYhkrIkFGXViMP7Rb264/Ad0VPQAWz2wjf X-Received: by 10.80.151.178 with SMTP id e47mr12253384edb.196.1513258303222; Thu, 14 Dec 2017 05:31:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513258303; cv=none; d=google.com; s=arc-20160816; b=tD2LOSzWr1Dt7l+kU2pS+d0i72CBYqhLueeub5HACylzPuKUe/wZEvABxSeab+CVXv 0cS0H86EHmPeMtJlydL193ARI4nE96kPbThaUnjnChS2SVqiP7xH0OwJLTV2d6UmLUL/ tom6nEgMq5MYS17APipFxCD1e1Z90yfPo9in4J/8jQE/sdIc+WyaIwHuDMCUTaM3LBDZ EOz7f/Br4x9MNw87sT0/n4sg4je8Sg8guZXsxWb7/Bf3/MJl8uec+nPG5uG6V6qCwECN U7DDcwIadtnJxiF1/2D1afkgkke5JQopSrT5qYqlUSDP7uQ6Rw5EYe9+H8laRcVjKO+e ar1g== 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=f4sHkdYXDlUY9axrA3FzVqoazGY9EdRoDz+qUoe7Rgk=; b=pJjY051kcgaEEuiKZyuhVHfCfzJ+hPlXbwEYMkzwD874tU+NPZ6X8Ly8qjWUDnNj/U V6zTSN6M8fLy+2ISug7hJ3JvX5qhiyDdY6m90GRNe1C8rNtG8Z+xPtPQDniyhEimDF7G J6gzM8ajTG/TVJm+64wr/JAIMCs76aO5WnuyUbo/WIx+tWWn+3QPcb6jkpE1KcNUUrHe pwSoLbt28EBKRsnvyuq8vaewdOLKWRlk4mHnmkexE1pQ+zX2TZoSiGKTL0E+SpFOnwuK f+KJfHlh53SDK5s4gvF3X6vVTYHTrnV0bz7MKFmlsWOWRWfxbeGzqFaoVaIIEFBBXn69 MxQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=KEa8x43n; 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=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id o28si3663839edo.135.2017.12.14.05.31.42; Thu, 14 Dec 2017 05:31:43 -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=@linaro.org header.s=google header.b=KEa8x43n; 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=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 14E8FC21F40; Thu, 14 Dec 2017 13:30:00 +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=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 6CE09C21F1D; Thu, 14 Dec 2017 13:27:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5B485C21F1D; Thu, 14 Dec 2017 13:27:20 +0000 (UTC) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by lists.denx.de (Postfix) with ESMTPS id 3421CC21E41 for ; Thu, 14 Dec 2017 13:27:17 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id f140so11399613wmd.2 for ; Thu, 14 Dec 2017 05:27:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=yniOR0/0sb4/KSFN1fg2UGQikR0W2ZFZC8XrW70JxMs=; b=KEa8x43n9ZxtqxPaTiYCMuEgA5ApAGZBrNTwEbBAfMrYGH6RDxko1FmMq/3tumZHcp f8jgMTRGJ5JEzyD5Uh0HhOVvDG/qodBvxrm0O8IW06oal7PZRKLIM2Le1igpiF+Sz9+a VrJjyJ5stFV6XLEuz2qJGdLmSgOrWqz8S8qE4= 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=yniOR0/0sb4/KSFN1fg2UGQikR0W2ZFZC8XrW70JxMs=; b=iwc7hLt7oRQRKpBoikBS+FqRbvIiGiAtZhaymUYW6jZ9wsgs5I3QNOaBWABWYY2ttj /1vBqpSZ5OxAMoBeCX2Vk+dSPSGJhQgjlzQmWyrTEOgP5KXSzQYF68MC2IpRJ+Z4CFrG QMZion9Fcphfvf+w3dSdRUI215dt7FBqrckQ0u1PXqYwrs3AaGw4PARfxU/NuEkVS4rz xuLrrmUg4//6NS1wSnzLyhZipSssX2Kz/lNUwGGAk7SfHISyU7kpz4TQb5qWkYdx4EDI PDx3djP6uIisvceiUCAhAJL56KCRoHZda8m1fop2Fa5q/+p6hw5qkI6mKY+mmPoaqcpA VP6A== X-Gm-Message-State: AKGB3mL6+AS7ftwmCKHArPRr8PhHoPayz9uTGzNrS2jeXAEDAeFQqD+s 027FlKKkofx8KjBG+PPYyyahZg== X-Received: by 10.28.27.206 with SMTP id b197mr2338604wmb.96.1513258036776; Thu, 14 Dec 2017 05:27:16 -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 l3sm3235378wrg.2.2017.12.14.05.27.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Dec 2017 05:27:15 -0800 (PST) From: Jorge Ramirez-Ortiz To: jorge.ramirez-ortiz@linaro.org, u-boot@lists.denx.de Date: Thu, 14 Dec 2017 14:27:00 +0100 Message-Id: <1513258020-23589-9-git-send-email-jorge.ramirez-ortiz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513258020-23589-1-git-send-email-jorge.ramirez-ortiz@linaro.org> References: <1513258020-23589-1-git-send-email-jorge.ramirez-ortiz@linaro.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 8/8] 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" 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 | 1 + 5 files changed, 83 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-mac-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 4c04544..570ee6d 100644 --- a/configs/dragonboard410c_defconfig +++ b/configs/dragonboard410c_defconfig @@ -45,3 +45,4 @@ 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