From patchwork Wed Mar 4 11:23:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 45410 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f200.google.com (mail-we0-f200.google.com [74.125.82.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 728F621486 for ; Wed, 4 Mar 2015 11:28:50 +0000 (UTC) Received: by wesw55 with SMTP id w55sf33489149wes.0 for ; Wed, 04 Mar 2015 03:28:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=JWyB6IZTI7VSVNE4KP0DmOpaVE0/M8sZUQwVBO0Jz50=; b=ZINjeLoN27ozscF+ahVNm/KUITLPil7MEkWItOSvXTgzb9RxfpGPy6cFCshJKCKB8n FphAX1RGJPszeM2nVsT4J5q/Wg1PpAM5rSjc4lsj3iI0wWu/DH/gs3selC+zogQkhBOE kcr2R0Awrd5Q1kxDtC9a0CVqRRorjhG842CJM08f0Pt8oqDkyvjcsy/ddms64Dmr+P7B QjjJUw39Kl5YjkvzyQ9MDO8pmw7jC6xPHv83AY3HU8dSsELpLVI35b5qQtRQDsmYhSfG zx8QpyEwn1h8hbVtaglARp9aluvgx6Z8IGyabmyPmTidO8aFHPvrwB0Kdezp3p+uBH07 B02A== X-Gm-Message-State: ALoCoQmerHUbfH6usZ0RLnbsQr6MBhCXAhlFTHQJdcyNtsQxGq7o79XyByHI7AimeWGI6uj8et9D X-Received: by 10.112.41.131 with SMTP id f3mr600675lbl.20.1425468529596; Wed, 04 Mar 2015 03:28:49 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.70 with SMTP id h6ls149974laa.78.gmail; Wed, 04 Mar 2015 03:28:49 -0800 (PST) X-Received: by 10.152.10.66 with SMTP id g2mr3011465lab.44.1425468451626; Wed, 04 Mar 2015 03:27:31 -0800 (PST) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id p3si2323089lbm.74.2015.03.04.03.27.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Mar 2015 03:27:31 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by labhs14 with SMTP id hs14so43734961lab.1 for ; Wed, 04 Mar 2015 03:27:31 -0800 (PST) X-Received: by 10.152.115.136 with SMTP id jo8mr3123655lab.32.1425468451541; Wed, 04 Mar 2015 03:27:31 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp1156292lbj; Wed, 4 Mar 2015 03:27:30 -0800 (PST) X-Received: by 10.66.241.8 with SMTP id we8mr6195950pac.44.1425468449568; Wed, 04 Mar 2015 03:27:29 -0800 (PST) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id bd12si4460247pdb.255.2015.03.04.03.27.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Mar 2015 03:27:29 -0800 (PST) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YT7R6-0002Gz-75; Wed, 04 Mar 2015 11:25:56 +0000 Received: from mail-wg0-f46.google.com ([74.125.82.46]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YT7P4-0000Ah-Ry for linux-arm-kernel@lists.infradead.org; Wed, 04 Mar 2015 11:23:51 +0000 Received: by wgha1 with SMTP id a1so45941274wgh.5 for ; Wed, 04 Mar 2015 03:23:27 -0800 (PST) X-Received: by 10.194.89.163 with SMTP id bp3mr6451129wjb.145.1425468206982; Wed, 04 Mar 2015 03:23:26 -0800 (PST) Received: from ards-macbook-pro.local ([213.143.61.51]) by mx.google.com with ESMTPSA id q10sm3965332wjr.41.2015.03.04.03.23.24 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 04 Mar 2015 03:23:26 -0800 (PST) From: Ard Biesheuvel To: catalin.marinas@arm.com, will.deacon@arm.com, mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 1/3] arm64: remove processor_id Date: Wed, 4 Mar 2015 12:23:15 +0100 Message-Id: <1425468197-22377-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1425468197-22377-1-git-send-email-ard.biesheuvel@linaro.org> References: <1425468197-22377-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150304_032351_097051_BD1C2559 X-CRM114-Status: UNSURE ( 9.63 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.46 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [74.125.82.46 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Ard Biesheuvel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ard.biesheuvel@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 The global processor_id is assigned the MIDR_EL1 value of the boot CPU in the early init code, but is never referenced afterwards. So remove it. Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/head.S | 10 +++------- arch/arm64/kernel/setup.c | 3 --- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 8ce88e08c030..003db2eadd7a 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -244,8 +244,7 @@ ENTRY(stext) bl el2_setup // Drop to EL1, w20=cpu_boot_mode bl __calc_phys_offset // x24=PHYS_OFFSET, x28=PHYS_OFFSET-PAGE_OFFSET bl set_cpu_boot_mode_flag - mrs x22, midr_el1 // x22=cpuid - mov x0, x22 + mrs x0, midr_el1 bl lookup_processor_type mov x23, x0 // x23=current cpu_table /* @@ -439,7 +438,6 @@ __switch_data: .quad __mmap_switched .quad __bss_start // x6 .quad __bss_stop // x7 - .quad processor_id // x4 .quad __fdt_pointer // x5 .quad memstart_addr // x6 .quad init_thread_union + THREAD_START_SP // sp @@ -457,11 +455,10 @@ __mmap_switched: str xzr, [x6], #8 // Clear BSS b 1b 2: - ldp x4, x5, [x3], #16 + ldr x5, [x3], #8 ldr x6, [x3], #8 ldr x16, [x3] mov sp, x16 - str x22, [x4] // Save processor ID str x21, [x5] // Save FDT pointer str x24, [x6] // Save PHYS_OFFSET mov x29, #0 @@ -633,8 +630,7 @@ ENTRY(secondary_startup) /* * Common entry point for secondary CPUs. */ - mrs x22, midr_el1 // x22=cpuid - mov x0, x22 + mrs x0, midr_el1 bl lookup_processor_type mov x23, x0 // x23=current cpu_table cbz x23, __error_p // invalid processor (x23=0)? diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index e8420f635bd4..8b82ef19b81b 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -63,9 +63,6 @@ #include #include -unsigned int processor_id; -EXPORT_SYMBOL(processor_id); - unsigned long elf_hwcap __read_mostly; EXPORT_SYMBOL_GPL(elf_hwcap);