Message ID | 20200707193423.v4.17.I9cd33fea6b1875fc7606864fb74ae8d92fb46d7b@changeid |
---|---|
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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) 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=bLsAdhmx; 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 4B1hpS2CTCz9sQt for <incoming@patchwork.ozlabs.org>; Wed, 8 Jul 2020 11:40:48 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 040458218E; Wed, 8 Jul 2020 03:38:17 +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="bLsAdhmx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A390A81F5A; Wed, 8 Jul 2020 03:37:50 +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,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd44.google.com (mail-io1-xd44.google.com [IPv6:2607:f8b0:4864:20::d44]) (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 68E3181F48 for <u-boot@lists.denx.de>; Wed, 8 Jul 2020 03:37:45 +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-io1-xd44.google.com with SMTP id v8so45214010iox.2 for <u-boot@lists.denx.de>; Tue, 07 Jul 2020 18:37:45 -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=Rj/c8tm4LizfKirhMRnStMh3IIs4dIUSM2dF+FK1hAU=; b=bLsAdhmxkHGLc0k1O5mubFdl2VQo+AF5x8sagSEa2/u/eaD1LubxyQENjZToKrElUw caFIQzHGvdx919zbWV/14XMfJpFZX0BTSthFl89N05ziDKGAxwC5xJ7SnUoVRT1bK8A6 Z9LdTAszRLdMvBQCf8ua+894JzLs8+XIF9PtA= 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=Rj/c8tm4LizfKirhMRnStMh3IIs4dIUSM2dF+FK1hAU=; b=HhGZ+wqYv9ABSFXXOqyLuhjC/igGef06uhrjAHHhnBNw9J2TBzJ4DOesQ5Of7B/sW7 dk/RzxobdwRfPL3WPmaX5vGQ5FI1zH41BFAO/LKn93lnZH1prEj3pLnzRzjqfTLgjfPS Mv8I9V7abm19LRaddSikvm8gg5WWJ7q7rU47/L8J0FqfOfyK8JLjYtFzPAG5AlhjXNyI H2b94+HGos404XijInbQZnZ+uIjUaghDlCpPC/Yc68ls7MXRnNztZcW79aTfd9/q5OiX l0ysdyZ7aoMiKif/rewFCGKSu6om/G6fvcw37PzvyMiL0ZXLptks5wv52e58q7jDytEz 2EQQ== X-Gm-Message-State: AOAM530ezc+oRNnpeYLhakJuMZWJ6mZgY0LkFx0/Z9tcllO8TCSE4/BO nTeXhYck0S5UgGgx65cfl0QSqwvV76YbeA== X-Google-Smtp-Source: ABdhPJyMEkF0gJJZgO/i+Xbeg/pp1toX/WkESE6Iazg0p+1PwmhHvibGein5yJ+pZGgrxtP6imfmkQ== X-Received: by 2002:a6b:1d7:: with SMTP id 206mr34263408iob.138.1594172264185; Tue, 07 Jul 2020 18:37:44 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id d6sm12538047ioo.9.2020.07.07.18.37.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 18:37:43 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Bin Meng <bmeng.cn@gmail.com>, Wolfgang Wallner <wolfgang.wallner@br-automation.com>, Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Simon Glass <sjg@chromium.org> Subject: [PATCH v4 17/25] x86: Don't enable SMP in SPL Date: Tue, 7 Jul 2020 19:34:37 -0600 Message-Id: <20200707193423.v4.17.I9cd33fea6b1875fc7606864fb74ae8d92fb46d7b@changeid> X-Mailer: git-send-email 2.27.0.383.g050319c2ae-goog In-Reply-To: <20200708013446.2600256-1-sjg@chromium.org> References: <20200708013446.2600256-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.3 at phobos.denx.de X-Virus-Status: Clean |
Series |
x86: Enhance MTRR functionality to support multiple CPUs
|
expand
|
diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile index ee0499f5d7..16e67e3da2 100644 --- a/arch/x86/cpu/Makefile +++ b/arch/x86/cpu/Makefile @@ -60,7 +60,7 @@ ifndef CONFIG_SYS_COREBOOT obj-$(CONFIG_$(SPL_TPL_)X86_32BIT_INIT) += irq.o endif ifndef CONFIG_$(SPL_)X86_64 -obj-$(CONFIG_SMP) += mp_init.o +obj-$(CONFIG_$(SPL_)SMP) += mp_init.o endif obj-y += mtrr.o obj-$(CONFIG_PCI) += pci.o diff --git a/arch/x86/include/asm/mp.h b/arch/x86/include/asm/mp.h index 34d724938a..5b8811832a 100644 --- a/arch/x86/include/asm/mp.h +++ b/arch/x86/include/asm/mp.h @@ -93,7 +93,7 @@ int x86_mp_init(void); */ typedef void (*mp_run_func)(void *arg); -#if defined(CONFIG_SMP) && !CONFIG_IS_ENABLED(X86_64) +#if CONFIG_IS_ENABLED(SMP) && !CONFIG_IS_ENABLED(X86_64) /** * mp_run_on_cpus() - Run a function on one or all CPUs *