Message ID | 20210424045627.313802-6-sjg@chromium.org |
---|---|
State | Superseded |
Delegated to: | Bin Meng |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=<UNKNOWN>) 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=dENg/IFc; 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 4FRzTQ5BmYz9sT6 for <incoming@patchwork.ozlabs.org>; Sat, 24 Apr 2021 14:59:06 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 403BE82CB5; Sat, 24 Apr 2021 06:57:54 +0200 (CEST) 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="dENg/IFc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E7E9D82C98; Sat, 24 Apr 2021 06:56:59 +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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) (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 8B35982B9B for <u-boot@lists.denx.de>; Sat, 24 Apr 2021 06:56:56 +0200 (CEST) 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-pj1-x1036.google.com with SMTP id g1-20020a17090adac1b0290150d07f9402so2249846pjx.5 for <u-boot@lists.denx.de>; Fri, 23 Apr 2021 21:56:56 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=uEtdZbER9DOCKX1yCBU0vTQJmn6n3+1qQYTMcFr14js=; b=dENg/IFcKZKk4NielqXu5MzTl7o3v+G7UuG5s7kSy87PfzT7/xK++4+mf3NhkSU3sA gHKiaSwMMiyBA6W04AlGqJrYlUT5F2oHXFGI8Yhsx2wZ4QEnxhwJ7UwudgKnXdWGvM4u L4u+5QtCSXUrTpfXtgcvxGz0c//yXnFTDTRK4= 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=uEtdZbER9DOCKX1yCBU0vTQJmn6n3+1qQYTMcFr14js=; b=q3CNDXrZhDme/iNuLXFREdEl472sPM6cMgqVT/XMSVMvLeW2yribcUNLmcmIgqVkzi 3Jo/y6BkPguJS8KzwNZ2FSE+5mhJSTOkQqIYzQpoGeFUeizatbjnLjHCBEazGQssxKrO zARdIXmylnxFFep8I4e92joUYdO5uOk/w7oCQfwbppN/+3v846ktcR9oiNXwBNJwIXQp 6ysdqUJ9PetGOL7YEzrr9EfyQu1TaMSueFgWuS+CVYd46aCMyJnd2ouj08wimyyybkB5 bc/ieIfygeAtFiRDqmrNe6q1M5wyLeedTnlYSFvGBCAgldx+e/AtEd6WkImVEeYCLglz g0wg== X-Gm-Message-State: AOAM531RxmIaczDHZP7wnZ8AY/BsbuHkynBdD98kpcRFwh00q3CvAUQQ Po0gymuJ1hMLmNb+aa0LTfavUxAptn2IqOJ2 X-Google-Smtp-Source: ABdhPJzfG04UTNo6lkfu2WOZYW6FBZ6OPIhuKUycQyZFFYM8V9usaevw3H+adzJ2TBFw3tJzmfaM9g== X-Received: by 2002:a17:90b:1d92:: with SMTP id pf18mr8259147pjb.71.1619240214911; Fri, 23 Apr 2021 21:56:54 -0700 (PDT) Received: from sjg1.roam.corp.google.com ([27.110.126.54]) by smtp.gmail.com with ESMTPSA id l35sm5949077pgm.10.2021.04.23.21.56.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Apr 2021 21:56:54 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Simon Glass <sjg@chromium.org>, Bin Meng <bmeng.cn@gmail.com> Subject: [PATCH v2 06/16] x86: Don't set up MTRRs if previously done Date: Sat, 24 Apr 2021 16:56:16 +1200 Message-Id: <20210424045627.313802-6-sjg@chromium.org> X-Mailer: git-send-email 2.31.1.498.g6c1eba8ee3d-goog In-Reply-To: <20210424045627.313802-1-sjg@chromium.org> References: <20210424045627.313802-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean |
Series |
misc: Some more misc patches
|
expand
|
diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c index e59215cc20e..c7f6c5a013e 100644 --- a/arch/x86/cpu/i386/cpu.c +++ b/arch/x86/cpu/i386/cpu.c @@ -423,7 +423,7 @@ static void setup_mtrr(void) u64 mtrr_cap; /* Configure fixed range MTRRs for some legacy regions */ - if (!gd->arch.has_mtrr) + if (!gd->arch.has_mtrr || !ll_boot_init()) return; mtrr_cap = native_read_msr(MTRR_CAP_MSR);