From patchwork Sat Dec 7 04:42:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1205366 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="eO9UAJEv"; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47VH9w5Z9gz9sPf for ; Sat, 7 Dec 2019 15:52:04 +1100 (AEDT) Received: from phobos.denx.de (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C582081720; Sat, 7 Dec 2019 05:48:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="eO9UAJEv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BB1C98168E; Sat, 7 Dec 2019 05:48:05 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x144.google.com (mail-il1-x144.google.com [IPv6:2607:f8b0:4864:20::144]) (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 EB19481719 for ; Sat, 7 Dec 2019 05:47:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x144.google.com with SMTP id z90so8110650ilc.8 for ; Fri, 06 Dec 2019 20:47:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qxv/+rjabSmkO/HuNogwVo4e45SbkUJLDDlBVePxS4s=; b=eO9UAJEvZpfYQov71ktmZLGpZQboDk+6Jwt0q8J6bMFCHcolrPGtwa2dwxLzqO54Dq 5ugXlJax5LDhdyZf1ecmrZwmqbwnvA4stdJnz3qtaNgsW6H+LlV/QWDyB9QfZpQbj8cS nDyeVkeSZrcXUrLDM1TxVxKh2ZH/iiHtqa7Ik= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=qxv/+rjabSmkO/HuNogwVo4e45SbkUJLDDlBVePxS4s=; b=nqJ/NGWnFW5FhakPv4eBEdHStldwtsSK7qRC4p1QVWICk+yH5NquaOc96P8XmonVA+ F7mAdVjisF2pZPFdFbNSVJaoKWkz4gC4zCSnwliNiqflpQy+p9hEXv54JagQjILDIDJE BrIJgi0yJPt0v8ftkfeIkaBVUtcNx3q6j1eLYWvH7+40yelT+uzUry8iP+xKHmzh9Bme LmRlqC14hw636AP4Ffd41yNDDJJlylmLhHomlip76uF1+ZjUjtHZSkrpb13aMYBEe1ZS Im293GexYNo+qoCuxXgvJB5/oyEcBDkfQ8YfHwOgW3dI5Rq98QIbv81ci5+BNqQAF3gP /b+g== X-Gm-Message-State: APjAAAX1FklMMbHZ/6tAG/RGhy6E6q73bTJoc4dRBmOZwoqrrwwJY8Ut fZiCv65Um0uMJGcgDYYltzVHsx27hDk= X-Google-Smtp-Source: APXvYqxfmIgjtgpb4O7dq6qJYaxHjFLu4gWkkCmlCuBmU03iUCuB6bO7EgrgHi0YMlfGSfVeWwZ2bw== X-Received: by 2002:a92:b657:: with SMTP id s84mr16251834ili.253.1575694077750; Fri, 06 Dec 2019 20:47:57 -0800 (PST) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id o7sm4549410ilo.58.2019.12.06.20.47.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Dec 2019 20:47:57 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Subject: [PATCH v6 031/102] x86: Adjust mrccache_get_region() to support get_mmap() Date: Fri, 6 Dec 2019 21:42:04 -0700 Message-Id: <20191206213936.v6.31.Id0bb6ec9d4d2cf41977720ea9aff51ed8e60ff1b@changeid> X-Mailer: git-send-email 2.24.0.393.g34dc348eaf-goog In-Reply-To: <20191207044315.51770-1-sjg@chromium.org> References: <20191207044315.51770-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 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.101.4 at phobos.denx.de X-Virus-Status: Clean It is now possible to obtain the memory map for a SPI controllers instead of having it hard-coded in the device tree. Update the code to support this. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: - Use SPI mmap() instead of SPI flash arch/x86/lib/mrccache.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c index 50c72bf962..7136166be6 100644 --- a/arch/x86/lib/mrccache.c +++ b/arch/x86/lib/mrccache.c @@ -210,6 +210,9 @@ int mrccache_get_region(struct udevice **devp, struct mrc_region *entry) { struct udevice *dev; ofnode mrc_node; + ulong map_base; + uint map_size; + uint offset; u32 reg[2]; int ret; @@ -221,10 +224,15 @@ int mrccache_get_region(struct udevice **devp, struct mrc_region *entry) ret = uclass_find_first_device(UCLASS_SPI_FLASH, &dev); if (ret) return log_msg_ret("Cannot find SPI flash\n", ret); - ret = dev_read_u32_array(dev, "memory-map", reg, 2); - if (ret) - return log_msg_ret("Cannot find memory map\n", ret); - entry->base = reg[0]; + ret = dm_spi_get_mmap(dev, &map_base, &map_size, &offset); + if (!ret) { + entry->base = map_base; + } else { + ret = dev_read_u32_array(dev, "memory-map", reg, 2); + if (ret) + return log_msg_ret("Cannot find memory map\n", ret); + entry->base = reg[0]; + } /* Find the place where we put the MRC cache */ mrc_node = dev_read_subnode(dev, "rw-mrc-cache"); @@ -239,6 +247,8 @@ int mrccache_get_region(struct udevice **devp, struct mrc_region *entry) if (devp) *devp = dev; + debug("MRC cache in '%s', offset %x, len %x, base %x\n", + dev->name, entry->offset, entry->length, entry->base); return 0; }