From patchwork Wed Jun 14 09:10:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 105487 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp194936qgd; Wed, 14 Jun 2017 02:12:37 -0700 (PDT) X-Received: by 10.84.208.102 with SMTP id f35mr3915070plh.53.1497431557398; Wed, 14 Jun 2017 02:12:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497431557; cv=none; d=google.com; s=arc-20160816; b=a0rLDRebLZu/w0ivFkQusXll6ACUJTPEeFhkv63a3S+GIWrMpfiMyA6jc0AK5LdIfr Wv0wIBxPSaugl37N2wJF+YsjMGdCe0lwObhFuSnOxU03cacNCeynhzVkTW1XYG2Jmn77 izWBa/BQpQAfav2+z5NPEn+ADOTDSpvv1kH70TEboANLTltDUN2uNFBbkA4rSetKLQwT /Dkr7J+82Sn4VoHXayZXuypjIG6E9d9lU/zc4FaPl9+EYI5wX31YOwHsTQFXzK40Wqtp Yg7Svcp8kUco07/CrWhwnWCjT98ZuxuChrXgkk3WJuXhE5FAu01FiYaKeXD1TtY2IyNW Rr3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=BshG5LLXI1Zz0s6naJsWV6Qc+AIPglnX+BxHiPrLAls=; b=cTXn8V+HyU2m7N8l+qgagy6/0xT7HyikZBXbpzDJ3ufLvTba3lGlcJ1TnWwiF/VG1v PLEZ+AGcbRym2wXI5iHiFtmnEK8nsJTZ8LbwRXV3Da4wH8altzxhOZ3P1xGIKUzLE4b4 kqi6BS6YywBHhE4vH8Ygt2HFcVR1q9DB/pEYBIQV3s+awq0bQ8BVwg2y2xCTSRrihbIC XrZyT2I8SQkhawOOZO7BflbAwbKM9IEO822Uzn/GbNDyWnhPCW8iV2N5VPngt3S42M3/ l+QshNRfpljt5MgvNZ9VPTp67QJzDVIAPWmoSS7WpwumVyKHl1iK8SY945ad/5SasWva xnQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=eWg9+ogg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l30si233860pli.420.2017.06.14.02.12.37; Wed, 14 Jun 2017 02:12:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=eWg9+ogg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752200AbdFNJMT (ORCPT + 25 others); Wed, 14 Jun 2017 05:12:19 -0400 Received: from mail-wr0-f180.google.com ([209.85.128.180]:35628 "EHLO mail-wr0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751459AbdFNJMR (ORCPT ); Wed, 14 Jun 2017 05:12:17 -0400 Received: by mail-wr0-f180.google.com with SMTP id q97so179924899wrb.2 for ; Wed, 14 Jun 2017 02:12:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BshG5LLXI1Zz0s6naJsWV6Qc+AIPglnX+BxHiPrLAls=; b=eWg9+oggI0SpKk6KpU1aOdN06bM0LJWkoZe3CqXdO0r2lh0qqHtKWrzDJKTGXPc0qd K79PqTGdz55Q9CoRoTZI0GvVKi677fd8R2mR4q5nf8VzIevaUJLV3DHyEiFp9e8ZPslf QyclVoCqI/AjROn27oet2M0HxLfnQc2jaO5hk= 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; bh=BshG5LLXI1Zz0s6naJsWV6Qc+AIPglnX+BxHiPrLAls=; b=AFoc3x6nWbVnN5PsKNtPqf9t63mRUe1r0kG4/D6Gqwknr+uzHUm7CIE1nLvxbpd1K2 9017/cVxkAn5j/cG6Kv38RfVJM6RVPwgnCGYjw67Ugqoks1mErxrOflwAxjsegZl6frK wIBpgMD05AqkfvJYbikC6igZPBE3G637gPlUbCDHj8AKV+FbpeTvjzrBfLH+4erqbGYn uXaVBR5okviPYSlHJXagdjkjUSpeiwALvUSVBaZfOpZux0dhfvnW7/g2UYz1rWHw7ylA M8Yw+2XjetVIwej0TUV9aEkKvhV9Vb+fSwD548ehh4vEeaDPsMmpyE9cUh279jiRT0IP fXEw== X-Gm-Message-State: AKS2vOzbFQiSPWGAbMs2zT3PBJDFCyOORz796iypTjTvnQ5N45J9LCnx JTzkFz8eMnA9AEyo X-Received: by 10.28.71.91 with SMTP id u88mr245777wma.9.1497431516579; Wed, 14 Jun 2017 02:11:56 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:19a:b336:54d7:46e9]) by smtp.gmail.com with ESMTPSA id y17sm444935wrb.39.2017.06.14.02.11.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Jun 2017 02:11:56 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de Cc: Frank Rowand , Marc Zyngier , Mark Rutland , linux-arm-kernel@lists.infradead.org (moderated list:ARM ARCHITECTED T...), linux-kernel@vger.kernel.org (open list:CLOCKSOURCE, CLOC...) Subject: [PATCH 1/2] clocksource/drivers/arm_arch_timer: Fix read and iounmap of incorrect variable Date: Wed, 14 Jun 2017 11:10:42 +0200 Message-Id: <1497431443-14634-1-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <20170614091021.GG2261@mai> References: <20170614091021.GG2261@mai> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Frank Rowand Fix boot warning 'Trying to vfree() nonexistent vm area' from arch_timer_mem_of_init(). Refactored code attempts to read and iounmap using address frame instead of address ioremap(frame->cntbase). Fixes: c389d701dfb70 ("clocksource: arm_arch_timer: split MMIO timer probing.") Signed-off-by: Frank Rowand Reviewed-by: Fu Wei Acked-by: Marc Zyngier Signed-off-by: Daniel Lezcano --- drivers/clocksource/arm_arch_timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 4bed671..8b5c300 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -1209,9 +1209,9 @@ arch_timer_mem_frame_get_cntfrq(struct arch_timer_mem_frame *frame) return 0; } - rate = readl_relaxed(frame + CNTFRQ); + rate = readl_relaxed(base + CNTFRQ); - iounmap(frame); + iounmap(base); return rate; }