From patchwork Tue Mar 24 13:45:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1260668 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=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=FzGXzkr1; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48msw72tl8z9sVd for ; Wed, 25 Mar 2020 00:45:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5A11480111; Tue, 24 Mar 2020 14:45:51 +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=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="FzGXzkr1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4C96A812FD; Tue, 24 Mar 2020 14:45:49 +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=-2.0 required=5.0 tests=BAYES_00,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-io1-xd43.google.com (mail-io1-xd43.google.com [IPv6:2607:f8b0:4864:20::d43]) (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 A1C61800BA for ; Tue, 24 Mar 2020 14:45:42 +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-io1-xd43.google.com with SMTP id k9so7418839iov.7 for ; Tue, 24 Mar 2020 06:45:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lP9/B4/PmUnWGCQ5OUpvhJX7AZfqReKA5Ks4saujPGI=; b=FzGXzkr1t52XXpCdbtdbSq6ce+QmvjXe8ex3FV67R8NdbzbEd2Xxr2xppGSrRt5JHg 8/Q7rpf4+VWKvKFER/KqfrPye9Kt5b6vs0YiAYoBvZo8NUDjKAYejcy7QA8mISJNNyZ5 8Njzb5jGy0H+UqcsqPX265K9p5BUaC3cPEnIo= 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:mime-version :content-transfer-encoding; bh=lP9/B4/PmUnWGCQ5OUpvhJX7AZfqReKA5Ks4saujPGI=; b=ag2aF4yHd3LcPzogkemcoDBjaIWtvndEmdXVxHc3lfG/fwwCcShaTzYw7w6GcTZ8k6 7y96HCdx81zv5ZewGDGs/4hVa8s+7XaGifrXO9RoOmYCSB12RMvQVNqSQBSg2Fr8SiiD YwWraH0S50PrP1YGp7v1rl8pIZw9GCfAo8PehGjxQLvfqiHP4yEpPVF6EF7Ygncwn+Ts es0RdUq/BHumlLG1i/cWcM+vezKzwcoyrT0eo81rjH28VJ/O2feDpQP2adj2/SU5zOU4 4wSkRUoP7vrhky5CzFpXjHX/n25VEnqqfGbzEYlgkhrbKIHqNGOGVy7aW3kTccx6BgL0 jkJw== X-Gm-Message-State: ANhLgQ2qwpQcW4iM0q0yytOUMIVJzSdHQd7I8bdqerLaJpy94Tgb1DW9 PTcXGk1qr6GbHvO6ALUFTQ3UyU390N8= X-Google-Smtp-Source: ADFU+vtE9sQ/3FOY0h/ne6b1WWWqej8d/R8pA4UWvkZh8vQTypo9oMJ8/iIx7SLolObm0vhh7a1Veg== X-Received: by 2002:a5e:d919:: with SMTP id n25mr23662493iop.205.1585057540866; Tue, 24 Mar 2020 06:45:40 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id z13sm1789642ioh.16.2020.03.24.06.45.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2020 06:45:40 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Bin Meng , Simon Glass , Jagan Teki , Jagannadha Sutradharudu Teki Subject: [PATCH] x86: spi: Only use the fast SPI peripheral when support Date: Tue, 24 Mar 2020 07:45:27 -0600 Message-Id: <20200324074524.1.Ibc9c511db58caa8a1e4c56d7e7824d7690718aeb@changeid> X-Mailer: git-send-email 2.25.1.696.g5e7596f4ac-goog MIME-Version: 1.0 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 At present we query the memory map on boards which don't support it. Fix this by only doing it on Apollo Lake. This fixes booting on chromebook_link. Signed-off-by: Simon Glass Fixes: 92842147c31 ("spi: ich: Add support for get_mmap() method") --- drivers/spi/ich.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c index a9d7715a55..9f8af45242 100644 --- a/drivers/spi/ich.c +++ b/drivers/spi/ich.c @@ -637,7 +637,10 @@ static int ich_get_mmap(struct udevice *dev, ulong *map_basep, uint *map_sizep, uint *offsetp) { struct udevice *bus = dev_get_parent(dev); + struct ich_spi_platdata *plat = dev_get_platdata(bus); + if (plat->ich_version != ICHV_APL) + return -ENOENT; return ich_get_mmap_bus(bus, map_basep, map_sizep, offsetp); }