From patchwork Mon Sep 14 16:47:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 7177501 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 95535BEEC1 for ; Mon, 14 Sep 2015 16:48:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 41ED720616 for ; Mon, 14 Sep 2015 16:48:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 41B5D20612 for ; Mon, 14 Sep 2015 16:48:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755866AbbINQsH (ORCPT ); Mon, 14 Sep 2015 12:48:07 -0400 Received: from mail-io0-f180.google.com ([209.85.223.180]:34076 "EHLO mail-io0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755816AbbINQsE (ORCPT ); Mon, 14 Sep 2015 12:48:04 -0400 Received: by iofb144 with SMTP id b144so173253364iof.1 for ; Mon, 14 Sep 2015 09:48:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=XJU3w1tlWopva3rAXmO+iHK3YGNp5TUOroPtgPPI6+U=; b=ITy6lih4fII9taihWPZQZ0DlQSTPj82WA8YlA2O3+fc8NqkWMC5+Z3v6oUdCBs3Qd3 1WEtf6BzLozEf4RlI56PyG2KAbUsseJX7AJC3cZL7CyzYzOIIErq23Pq50Kcq+8P5xhp OccMhjxZgyqVcDj+Rofx6hgPXyDdr5boaJEXfkZapcujCBDRO4ndNUr7yZzQNhfUlSwG TKGxHB/V1ZxP4qwEtVYHIzkEjHnoEhOueg7LA+YzHCaPIqh20ytV/e1F9BKYzWeQhIQ1 CHf5Y7WCx+d5CsKkNKJ4RjH6wHAI3kpIliglOenU8FL+keYfPED05WoW8WG8Cf5KZM6e raPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=XJU3w1tlWopva3rAXmO+iHK3YGNp5TUOroPtgPPI6+U=; b=KFpwFX/SBTXHEoYfLuO9oO5pj/WvaHiRK1EwgnDC7mhBcalC2jjHJsU6VlbeCy9Z9y 7rvLEl7j1lpjNFNWpmHArP9z/nfwaJD9+vx3/NWAA/+hiLP6LggVwToX4UNKqeoOacvL t9BUfhXI37RB4m7Tdhoqpjh2eT6Xsj4YuYD3qZm0SFSHS100gKrT5cMAmgVImlCheqGz 762qE7coZdO9W8I3Blu5Kyu7fsSOleSPqWgSrKGMOSaUNTL+i9mMsvRV6gtKyWHu986h b/97Irw3NX49C/sKCYcfCGOjjskFVx1thx4/28nW0JeFNorCe4pQap7dDBdn1nsmq34l ikNQ== X-Gm-Message-State: ALoCoQnqzhv9P6IzNw6PcDcbMtK3DLe6ifEYCzkWyL3A2B2em/N4JY143e2I0fC/WYkqkHE6a5BV X-Received: by 10.107.10.103 with SMTP id u100mr28326185ioi.182.1442249282509; Mon, 14 Sep 2015 09:48:02 -0700 (PDT) Received: from google.com (173-27-161-33.client.mchsi.com. [173.27.161.33]) by smtp.gmail.com with ESMTPSA id ht6sm5708712igb.11.2015.09.14.09.47.59 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 14 Sep 2015 09:48:01 -0700 (PDT) Date: Mon, 14 Sep 2015 11:47:56 -0500 From: Bjorn Helgaas To: Ard Biesheuvel Cc: linux-pci@vger.kernel.org, thierry.reding@gmail.com, linux-tegra@vger.kernel.org, swarren@wwwdotorg.org Subject: Re: [PATCH resend] PCI: tegra: use __pgprot() around static pgprot_t initializer Message-ID: <20150914164756.GM829@google.com> References: <1440578974-26527-1-git-send-email-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1440578974-26527-1-git-send-email-ard.biesheuvel@linaro.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Wed, Aug 26, 2015 at 10:49:34AM +0200, Ard Biesheuvel wrote: > In order to comply with the rules that apply when STRICT_MM_TYPECHECKS > is defined, wrap the initializer for a pgprot_t in __pgprot(). > > Signed-off-by: Ard Biesheuvel Applied with Thierry's ack to pci/host-tegra for v4.4, thanks! > --- > drivers/pci/host/pci-tegra.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c > index 10c05718dbfd..0d3e6cb0c459 100644 > --- a/drivers/pci/host/pci-tegra.c > +++ b/drivers/pci/host/pci-tegra.c > @@ -382,8 +382,8 @@ static unsigned long tegra_pcie_conf_offset(unsigned int devfn, int where) > static struct tegra_pcie_bus *tegra_pcie_bus_alloc(struct tegra_pcie *pcie, > unsigned int busnr) > { > - pgprot_t prot = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | L_PTE_XN | > - L_PTE_MT_DEV_SHARED | L_PTE_SHARED; > + pgprot_t prot = __pgprot(L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | > + L_PTE_XN | L_PTE_MT_DEV_SHARED | L_PTE_SHARED); > phys_addr_t cs = pcie->cs->start; > struct tegra_pcie_bus *bus; > unsigned int i; > -- > 1.9.1 commit 512ee2fd9ca1c0b447a144c6c49a53a010f8d6fa Author: Ard Biesheuvel Date: Wed Aug 26 10:49:34 2015 +0200 PCI: tegra: Wrap static pgprot_t initializer with __pgprot() Wrap pgprot_t initializer with __pgprot() to comply with the STRICT_MM_TYPECHECKS rules. [bhelgaas: changelog] Signed-off-by: Ard Biesheuvel Signed-off-by: Bjorn Helgaas Acked-by: Thierry Reding --- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c index 81df0c1..3018ae5 100644 --- a/drivers/pci/host/pci-tegra.c +++ b/drivers/pci/host/pci-tegra.c @@ -382,8 +382,8 @@ static unsigned long tegra_pcie_conf_offset(unsigned int devfn, int where) static struct tegra_pcie_bus *tegra_pcie_bus_alloc(struct tegra_pcie *pcie, unsigned int busnr) { - pgprot_t prot = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | L_PTE_XN | - L_PTE_MT_DEV_SHARED | L_PTE_SHARED; + pgprot_t prot = __pgprot(L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | + L_PTE_XN | L_PTE_MT_DEV_SHARED | L_PTE_SHARED); phys_addr_t cs = pcie->cs->start; struct tegra_pcie_bus *bus; unsigned int i;