From patchwork Mon Aug 4 08:16:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 34765 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7E3BC20F2E for ; Mon, 4 Aug 2014 08:18:54 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id i7sf38576142oag.8 for ; Mon, 04 Aug 2014 01:18:53 -0700 (PDT) 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:cc :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=g/3Q9Oa1vZewqIweE4TPmQIkXMmc4TTXDjIB35gxwJY=; b=Jwg6Y3AoiMXpGlYD8JHaBXwfVQdAkyXhJLPw3c34OwdICWg4CEWZw7u1flj8ALlqBs cRwFHlrPg3YyGG37YMJcHu4VQGL57/9r8qq3QChxWId6AiSVnly3DP3YPy2QyLnahOwd syEUuDq7M7YbyA/k/FzCEEfNdae9sQ+36iDZM2vhY4z0kdLE+/MEXodihz20jSiggAjY UfKK+7vZnwDEKz8g1XLqLg2KUxD8fffylBCuTTor+yXbLGfty2zckPf6+K+POe4rDwja 0uMsa1N9z2oAdrrr1+kLB6ogaEVfPj1JwPiRh0dhmJFxI7XwBj7jQmmEnnsHb74NqYlw d41w== X-Gm-Message-State: ALoCoQlsVGAxOmJt7TZty+y+yZGgS8ro+2+pDBcL7yx1+W085Kj1lNBSNT2K4HgmxfcI2RuzgpKj X-Received: by 10.182.32.1 with SMTP id e1mr8834992obi.11.1407140333598; Mon, 04 Aug 2014 01:18:53 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.87.226 with SMTP id r89ls2022926qgd.44.gmail; Mon, 04 Aug 2014 01:18:53 -0700 (PDT) X-Received: by 10.52.239.6 with SMTP id vo6mr1773565vdc.59.1407140333451; Mon, 04 Aug 2014 01:18:53 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id m8si11514081vcj.67.2014.08.04.01.18.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Aug 2014 01:18:53 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id lf12so10315561vcb.26 for ; Mon, 04 Aug 2014 01:18:53 -0700 (PDT) X-Received: by 10.52.52.136 with SMTP id t8mr18640236vdo.21.1407140333359; Mon, 04 Aug 2014 01:18:53 -0700 (PDT) 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.221.37.5 with SMTP id tc5csp286631vcb; Mon, 4 Aug 2014 01:18:52 -0700 (PDT) X-Received: by 10.68.164.100 with SMTP id yp4mr832207pbb.136.1407140332459; Mon, 04 Aug 2014 01:18:52 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id gj11si16769588pbd.171.2014.08.04.01.18.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Aug 2014 01:18:52 -0700 (PDT) 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 1XEDSU-0006EI-Lh; Mon, 04 Aug 2014 08:17:30 +0000 Received: from mail-wg0-f45.google.com ([74.125.82.45]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XEDSS-00069N-Bp for linux-arm-kernel@lists.infradead.org; Mon, 04 Aug 2014 08:17:28 +0000 Received: by mail-wg0-f45.google.com with SMTP id x12so7105158wgg.4 for ; Mon, 04 Aug 2014 01:17:02 -0700 (PDT) X-Received: by 10.180.106.6 with SMTP id gq6mr11097191wib.5.1407140221698; Mon, 04 Aug 2014 01:17:01 -0700 (PDT) Received: from ards-macbook-pro.local ([188.252.229.85]) by mx.google.com with ESMTPSA id ub11sm38363410wib.1.2014.08.04.01.17.00 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Aug 2014 01:17:00 -0700 (PDT) From: Ard Biesheuvel To: will.deacon@arm.com, mark.rutland@arm.com, catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/3] arm64: fix typo in I-cache policy detection Date: Mon, 4 Aug 2014 10:16:54 +0200 Message-Id: <1407140216-22747-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140804_011728_552988_59EF25DB X-CRM114-Status: UNSURE ( 9.90 ) 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.45 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [74.125.82.45 listed in wl.mailspike.net] -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.220.181 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 This removes an unfortunately placed semi-colon resulting in all instruction caches being classified as AIVIVT. Signed-off-by: Ard Biesheuvel Acked-by: Mark Rutland --- arch/arm64/kernel/cpuinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c index f82f7d1c468e..744fad2ff418 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -49,7 +49,7 @@ static void cpuinfo_detect_icache_policy(struct cpuinfo_arm64 *info) if (l1ip != ICACHE_POLICY_PIPT) set_bit(ICACHEF_ALIASING, &__icache_flags); - if (l1ip == ICACHE_POLICY_AIVIVT); + if (l1ip == ICACHE_POLICY_AIVIVT) set_bit(ICACHEF_AIVIVT, &__icache_flags); pr_info("Detected %s I-cache on CPU%d", icache_policy_str[l1ip], cpu);