From patchwork Tue Mar 4 15:50:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liviu Dudau X-Patchwork-Id: 25689 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f200.google.com (mail-pd0-f200.google.com [209.85.192.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 54D992066C for ; Tue, 4 Mar 2014 15:52:52 +0000 (UTC) Received: by mail-pd0-f200.google.com with SMTP id p10sf13663361pdj.7 for ; Tue, 04 Mar 2014 07:52:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=cA2MF4nEZ9ZRritNy2j3i7FbiGLkWRWfBJk7tzzN28U=; b=lFBIwuhbwQQoe2sRZghFjkBI2QRIoIGtm6MRsp7xfnEWV397fPhRVqMxU6pPd9zz24 oWCevshFmvXC3An1kWthGXXgOMucdXZTWIJqGbVwd7LENnFUqR8C1v8hpihhaJpDbkYw J+gFtzgCMzvMku/IJR7vDAIZjDCvEqgt4ysuIFSuYSO/UPNE819xPHXkltHiwkG/u0r9 kT7zEoHc0MJo4bHp9ZOmhIiLl+6kqdZ4YUuQf7YPkWHtfx/Q1PLk69c6m16xtMZUNU3q GilT+SoeVJ1/8c1MudtV7mBFGAiZomCzhF6EyRT6x1Cuoi0BhMllfTvZOt4b0h0WhUL/ wMlA== X-Gm-Message-State: ALoCoQkMk/PJAdqJxW/fH+qH0/JwDdDn9zmeJfbG9lxQIrfO80vxB3PRvtePlKmkAf54jcz63ASy X-Received: by 10.66.221.137 with SMTP id qe9mr171696pac.4.1393948371414; Tue, 04 Mar 2014 07:52:51 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.93.33 with SMTP id c30ls2526124qge.9.gmail; Tue, 04 Mar 2014 07:52:51 -0800 (PST) X-Received: by 10.58.40.99 with SMTP id w3mr142591vek.56.1393948371283; Tue, 04 Mar 2014 07:52:51 -0800 (PST) Received: from mail-ve0-f176.google.com (mail-ve0-f176.google.com [209.85.128.176]) by mx.google.com with ESMTPS id y6si4357770veb.63.2014.03.04.07.52.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Mar 2014 07:52:51 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.176; Received: by mail-ve0-f176.google.com with SMTP id cz12so5776613veb.7 for ; Tue, 04 Mar 2014 07:52:51 -0800 (PST) X-Received: by 10.58.211.8 with SMTP id my8mr118658vec.80.1393948371073; Tue, 04 Mar 2014 07:52:51 -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.220.130.193 with SMTP id u1csp136098vcs; Tue, 4 Mar 2014 07:52:50 -0800 (PST) X-Received: by 10.68.196.168 with SMTP id in8mr308143pbc.132.1393948370150; Tue, 04 Mar 2014 07:52:50 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a3si10974137pay.136.2014.03.04.07.52.49; Tue, 04 Mar 2014 07:52:49 -0800 (PST) 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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755012AbaCDPwe (ORCPT + 26 others); Tue, 4 Mar 2014 10:52:34 -0500 Received: from fw-tnat.cambridge.arm.com ([217.140.96.21]:51547 "EHLO cam-smtp0.cambridge.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754596AbaCDPux (ORCPT ); Tue, 4 Mar 2014 10:50:53 -0500 Received: from e106497-lin.cambridge.arm.com (e106497-lin.cambridge.arm.com [10.1.195.170]) by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id s24FoGdW013621; Tue, 4 Mar 2014 15:50:16 GMT From: Liviu Dudau To: linux-pci , Bjorn Helgaas , Catalin Marinas , Will Deacon , linaro-kernel Cc: Benjamin Herrenschmidt , LKML , "devicetree@vger.kernel.org" , LAKML , Tanmay Inamdar , Arnd Bergmann Subject: [PATCH v5 1/3] Fix ioport_map() for !CONFIG_GENERIC_IOMAP cases. Date: Tue, 4 Mar 2014 15:50:14 +0000 Message-Id: <1393948216-11599-2-git-send-email-Liviu.Dudau@arm.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1393948216-11599-1-git-send-email-Liviu.Dudau@arm.com> References: <1393948216-11599-1-git-send-email-Liviu.Dudau@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: liviu.dudau@arm.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The inline version of ioport_map() that gets used when !CONFIG_GENERIC_IOMAP is wrong. It returns a mapped (i.e. virtual) address that can start from zero and completely ignores the PCI_IOBASE and IO_SPACE_LIMIT that most architectures that use !CONFIG_GENERIC_MAP define. Signed-off-by: Liviu Dudau Acked-by: Arnd Bergmann diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index d5afe96..df72051 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -331,7 +331,7 @@ static inline void iounmap(void __iomem *addr) #ifndef CONFIG_GENERIC_IOMAP static inline void __iomem *ioport_map(unsigned long port, unsigned int nr) { - return (void __iomem *) port; + return (void __iomem *)(PCI_IOBASE + (port & IO_SPACE_LIMIT)); } static inline void ioport_unmap(void __iomem *p)