From patchwork Sun Mar 17 00:06:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1057454 X-Patchwork-Delegate: lorenzo.pieralisi@arm.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JfTBJJuz"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44MKNh2fLxz9s4Y for ; Sun, 17 Mar 2019 11:06:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726923AbfCQAGW (ORCPT ); Sat, 16 Mar 2019 20:06:22 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:45863 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726828AbfCQAGW (ORCPT ); Sat, 16 Mar 2019 20:06:22 -0400 Received: by mail-wr1-f65.google.com with SMTP id h99so13165994wrh.12; Sat, 16 Mar 2019 17:06:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RE33TNUWm4/0ZBXVkUx6gT3N2Blrm0ry0PL8IYLdT2g=; b=JfTBJJuzZROtqv1HYX9v13eyL0LpbL7gV/RD1BvKP0Ua78LCwdD+xJOeghUUsHPrrK fq/umzZVw9aCjM3QO8H0CEdAI047kco/LBjToPhwwWGUlUWBojUb0UuzCXEiOcfg3DNL yB34FvbTmbZgR/ciAVrY98abWvPQ0pxcnOZadS4tI91+LbdmSPGr+BIc2z5A/1V8tl7a qj3itkIrtiJTxfZ9sVvd1haR2NWAj4XGHvc9r/VU++wP++rfRbTcl0HcqMFZewRgVIQ3 9xa8ckhOdogAAbf8WSOLOc1QtqFEWO70bto7DLNyX8I4OPa/n3WKQF4OFbWJhjiK/ivg bTTA== 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:mime-version :content-transfer-encoding; bh=RE33TNUWm4/0ZBXVkUx6gT3N2Blrm0ry0PL8IYLdT2g=; b=Uu3EphO/jrXgyjCaz5ty1DC1zhTFmK+CHQlZUaM/QAOezUaMb4Y2g8a8/R2lfg6XiG hgoKLjtBB2jXas/hB/U2m1STd3vMOf8vVw6T2H6uJlxtFgm4BIGw22JkmsAp/GTa8IOV qCcV1okrXYDsc7Jw73IWwxUcocbsvTnxpQC1E214PcUkTEJk1lxl5mVbH1G3mkYKPmMo s7yM1pVh6HOrlNyUS/qruKKqMXo0/jUvMxt41AuTjBokLY1CPpXQFbjiQzjQekVK7RRn I/IIkEFfvD/SCIxzozsyuJTEi5fSYooSF9b3quutAlQkXPFn6FaDAaD6bstqc+6viFw+ oDxw== X-Gm-Message-State: APjAAAUxvLSlgGt2H24lbitOeQy8kDl1zh0TDO+GCHqFC0j+bgkjb5A2 pXBQG+wzgRFVOtoRcR4HDKWokIW2 X-Google-Smtp-Source: APXvYqxFhzpLvx35aaQN+CoZbEK/jyPeQqS/A+6d8b1tNTPFYy3J3u8BHZdIFBDAoXHeBWv/r8HFqQ== X-Received: by 2002:a5d:4e46:: with SMTP id r6mr6840110wrt.210.1552781180729; Sat, 16 Mar 2019 17:06:20 -0700 (PDT) Received: from kurokawa.lan (ip-86-49-110-70.net.upcbroadband.cz. [86.49.110.70]) by smtp.gmail.com with ESMTPSA id b3sm6759016wrx.57.2019.03.16.17.06.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Mar 2019 17:06:19 -0700 (PDT) From: marek.vasut@gmail.com To: linux-pci@vger.kernel.org Cc: Marek Vasut , Geert Uytterhoeven , Phil Edworthy , Simon Horman , Wolfram Sang , linux-renesas-soc@vger.kernel.org Subject: [PATCH 1/3] PCI: rcar: Replace unsigned long with u32 for register values Date: Sun, 17 Mar 2019 01:06:06 +0100 Message-Id: <20190317000608.24881-1-marek.vasut@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Marek Vasut Replace unsigned long with u32 type for variables holding register values, since the registers are 32bit. Note that rcar_pcie_msi_irq() still uses unsigned long because both find_first_bit() and __fls() require unsigned long as an argument. Signed-off-by: Marek Vasut Cc: Geert Uytterhoeven Cc: Phil Edworthy Cc: Simon Horman Cc: Wolfram Sang Cc: linux-renesas-soc@vger.kernel.org To: linux-pci@vger.kernel.org Reviewed-by: Geert Uytterhoeven --- drivers/pci/controller/pcie-rcar.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c index 1408c8aa758b..857d88fd03d5 100644 --- a/drivers/pci/controller/pcie-rcar.c +++ b/drivers/pci/controller/pcie-rcar.c @@ -169,7 +169,7 @@ enum { static void rcar_rmw32(struct rcar_pcie *pcie, int where, u32 mask, u32 data) { - int shift = 8 * (where & 3); + u32 shift = 8 * (where & 3); u32 val = rcar_pci_read_reg(pcie, where & ~3); val &= ~(mask << shift); @@ -179,7 +179,7 @@ static void rcar_rmw32(struct rcar_pcie *pcie, int where, u32 mask, u32 data) static u32 rcar_read_conf(struct rcar_pcie *pcie, int where) { - int shift = 8 * (where & 3); + u32 shift = 8 * (where & 3); u32 val = rcar_pci_read_reg(pcie, where & ~3); return val >> shift; @@ -190,7 +190,7 @@ static int rcar_pcie_config_access(struct rcar_pcie *pcie, unsigned char access_type, struct pci_bus *bus, unsigned int devfn, int where, u32 *data) { - int dev, func, reg, index; + u32 dev, func, reg, index; dev = PCI_SLOT(devfn); func = PCI_FUNC(devfn); @@ -508,7 +508,7 @@ static void phy_write_reg(struct rcar_pcie *pcie, unsigned int rate, unsigned int addr, unsigned int lane, unsigned int data) { - unsigned long phyaddr; + u32 phyaddr; phyaddr = WRITE_CMD | ((rate & 1) << RATE_POS) | @@ -1116,7 +1116,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct rcar_pcie *pcie; - unsigned int data; + u32 data; int err; int (*phy_init_fn)(struct rcar_pcie *); struct pci_host_bridge *bridge; From patchwork Sun Mar 17 00:06:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1057455 X-Patchwork-Delegate: lorenzo.pieralisi@arm.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lUAzU+S/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44MKNk0dnWz9s5c for ; Sun, 17 Mar 2019 11:06:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726927AbfCQAGZ (ORCPT ); Sat, 16 Mar 2019 20:06:25 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:38487 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726828AbfCQAGZ (ORCPT ); Sat, 16 Mar 2019 20:06:25 -0400 Received: by mail-wr1-f67.google.com with SMTP id g12so13199741wrm.5; Sat, 16 Mar 2019 17:06:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UzQAOaNFJl4O9dGDd5nLwwB9pTU2KwSKAP9fzeea2dg=; b=lUAzU+S/K+fXxz9SYbMFmpddHWyGf2a23IzexYfBWDkeFW6aOIqSledY9N4c1AMNGC j0Oa3Rd4vjSuNYvCkQWYFUEORz/ABYlfyrXQ6f5LmMaB6yAO5QbmzfBpPJaHC9gNoX2J JzhTAnjM+JtLMkB/MQ2ju50mXExrjNLOOPtm+/Fe8OQHkh7CqtrXslZwYJ5vD8jBfnIX /NABwOLu5YNctmVRhLW5e9UHVlmZStesqsOMTan66W2Yr59eGUSSai8meIW0c70Cn0Pw ahLM2PHZQpDWoUHPEAyC88hxJ4nFAkRDhfzdgo4xiQXHICwmgExf05iUiy1biERG22Dp 0oZw== 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:mime-version:content-transfer-encoding; bh=UzQAOaNFJl4O9dGDd5nLwwB9pTU2KwSKAP9fzeea2dg=; b=RPf64ssE6abyoC/NADO/GCAmNqGEoR+mXves3zj/C5WipELik5mvKYv/yXcij0WQxU Yl7ww9zREGXuz0/nXgD6vrmBWTLTmz1y9DTuUnNglmMKSgLhZkg5l+0ts6NzrlkKmeYZ CmyJm0/lpmZYJSo4yheJPHjcJ4va4ekahKPPqT6LDkn4ygPl1IfFeULEelkadgfoRTMc LmTOSYNCOvPwCXWeiVTNUXfYZ8PgDtVQmZtnfmioi38VikIk5+2GPVtnE8B1p78NU19F U2WLxXNwOp4OBsFi8kbqHmKrxIlW46u+VanEqsG5+0rTfHCNhIB55IBvzTswIJcVt3WC Olbw== X-Gm-Message-State: APjAAAV/+X+y+0aoHIp7fZcDlzK3F4WshP7bLY0LHlWLtJgjhq/FLC5W FpM+5n1pEnjZgRs/i0JcwBPzputV X-Google-Smtp-Source: APXvYqxfNcCo+Lsepr3q0rBg/OzVqXyCsgbUV0vvc5ayQhxT8j/TSKvh6O7evCi+mNZW7F04/b8cxw== X-Received: by 2002:a5d:4a4d:: with SMTP id v13mr6837365wrs.169.1552781182649; Sat, 16 Mar 2019 17:06:22 -0700 (PDT) Received: from kurokawa.lan (ip-86-49-110-70.net.upcbroadband.cz. [86.49.110.70]) by smtp.gmail.com with ESMTPSA id b3sm6759016wrx.57.2019.03.16.17.06.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Mar 2019 17:06:21 -0700 (PDT) From: marek.vasut@gmail.com To: linux-pci@vger.kernel.org Cc: Marek Vasut , Geert Uytterhoeven , Phil Edworthy , Simon Horman , Wolfram Sang , linux-renesas-soc@vger.kernel.org Subject: [PATCH 2/3] PCI: rcar: Allow 64bit MSI addresses Date: Sun, 17 Mar 2019 01:06:07 +0100 Message-Id: <20190317000608.24881-2-marek.vasut@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190317000608.24881-1-marek.vasut@gmail.com> References: <20190317000608.24881-1-marek.vasut@gmail.com> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Marek Vasut The MSI address can be 64bit. Switch the data type used to hold the result of virt_to_phys() to phys_addr_t to reflect it's properties correctly and program the top 32bits of PA into PCIEMSIAUR. Signed-off-by: Marek Vasut Cc: Geert Uytterhoeven Cc: Phil Edworthy Cc: Simon Horman Cc: Wolfram Sang Cc: linux-renesas-soc@vger.kernel.org To: linux-pci@vger.kernel.org Reviewed-by: Geert Uytterhoeven --- drivers/pci/controller/pcie-rcar.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c index 857d88fd03d5..801925a136ae 100644 --- a/drivers/pci/controller/pcie-rcar.c +++ b/drivers/pci/controller/pcie-rcar.c @@ -888,7 +888,7 @@ static int rcar_pcie_enable_msi(struct rcar_pcie *pcie) { struct device *dev = pcie->dev; struct rcar_msi *msi = &pcie->msi; - unsigned long base; + phys_addr_t base; int err, i; mutex_init(&msi->lock); @@ -930,7 +930,7 @@ static int rcar_pcie_enable_msi(struct rcar_pcie *pcie) base = virt_to_phys((void *)msi->pages); rcar_pci_write_reg(pcie, base | MSIFE, PCIEMSIALR); - rcar_pci_write_reg(pcie, 0, PCIEMSIAUR); + rcar_pci_write_reg(pcie, base >> 32, PCIEMSIAUR); /* enable all MSI interrupts */ rcar_pci_write_reg(pcie, 0xffffffff, PCIEMSIIER); From patchwork Sun Mar 17 00:06:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1057456 X-Patchwork-Delegate: lorenzo.pieralisi@arm.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LjN2yV00"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44MKNk5Pwqz9s4Y for ; Sun, 17 Mar 2019 11:06:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726971AbfCQAG1 (ORCPT ); Sat, 16 Mar 2019 20:06:27 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:54558 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726828AbfCQAG1 (ORCPT ); Sat, 16 Mar 2019 20:06:27 -0400 Received: by mail-wm1-f68.google.com with SMTP id f3so9799222wmj.4; Sat, 16 Mar 2019 17:06:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p8Ma/WL1YXhBXsJzZ6ueZraNvQHOb8cz2XymL8hJEnU=; b=LjN2yV00LUw5e2LR9wgNBwIu7nxF2WX3/mb79Q7H+YOLExDYHdA+NEzh1Oa+irKk3C BVQ4BFLk2HGdKsqYT8qp6WdC3f8goRMsTwVO6LGjL94KqM8T0SnBUJaU+BmL2dWors7s +e/Gygt5lBnq0E+2609jar6fb0iwOmE3ZluJxllZwGQudeAUCh+Q+NXwbt+vu+1/8K4D Pbiua8860jJKF+4i9yU15Eua6v/E4Wgs3wfIv/Va5qpSehEYVLSxqMHiiRFcBaD01CkG Obb2lJsA5Ni7QXrSYHTuAGcNP9pCdqoSSDGjGmZNvn+wx9iwSy69sVtgd20CdcFrJm1J oy8Q== 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:mime-version:content-transfer-encoding; bh=p8Ma/WL1YXhBXsJzZ6ueZraNvQHOb8cz2XymL8hJEnU=; b=bkmurKxH+CIuMsyHA9bQFLWKxJtTIPYczwr8+tfkgYkUUXu9x0XLfusZJyq7a1g/6g Lw/F/PpmUE1VpTD9r5FXp/0y4WVf5BvnpTPrDtOqjfcIa8CViaYegQux2X5sj79hLwkj PydmSu3A0JU7+PWl3P7KVuZTYwEhd/KM6WS3XhodD+muFKntiL5M3KpDJSMElUJJ7etM yhB34SVDyo40yVLrnZjJBsPMa2jUg/tk4vkEtZVgTqBROqElubpvRFUyaQE06Dwwup+g 0qrr+mMvHtIcpWuyqVcuyQwEor9pxAymZrAm2Rdkt1epYsGPPRQMkWyeTCA7N5QXQxOt XYJw== X-Gm-Message-State: APjAAAV759azZcphEKnMCglh0kgzrCuKbC797ABG9M0kxVY940AmCzAD W0biG8h60PcXBtra8iGH45s6Kf7i X-Google-Smtp-Source: APXvYqwKZOOlC5wR0luK4syF4t+BoHwa6QEq0sOi6oyRHPUtp/5EJhsp/SAZggvzYWayTjH0Ontq+Q== X-Received: by 2002:a1c:dc0a:: with SMTP id t10mr6508499wmg.101.1552781184543; Sat, 16 Mar 2019 17:06:24 -0700 (PDT) Received: from kurokawa.lan (ip-86-49-110-70.net.upcbroadband.cz. [86.49.110.70]) by smtp.gmail.com with ESMTPSA id b3sm6759016wrx.57.2019.03.16.17.06.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Mar 2019 17:06:23 -0700 (PDT) From: marek.vasut@gmail.com To: linux-pci@vger.kernel.org Cc: Marek Vasut , Geert Uytterhoeven , Phil Edworthy , Simon Horman , Wolfram Sang , linux-renesas-soc@vger.kernel.org Subject: [PATCH 3/3] PCI: rcar: Clean up debug messages Date: Sun, 17 Mar 2019 01:06:08 +0100 Message-Id: <20190317000608.24881-3-marek.vasut@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190317000608.24881-1-marek.vasut@gmail.com> References: <20190317000608.24881-1-marek.vasut@gmail.com> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Marek Vasut Drop useless casts from debug messages, they are no longer needed due to the data type cleanup. Signed-off-by: Marek Vasut Cc: Geert Uytterhoeven Cc: Phil Edworthy Cc: Simon Horman Cc: Wolfram Sang Cc: linux-renesas-soc@vger.kernel.org To: linux-pci@vger.kernel.org Reviewed-by: Wolfram Sang Reviewed-by: Geert Uytterhoeven --- drivers/pci/controller/pcie-rcar.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c index 801925a136ae..2a012654686e 100644 --- a/drivers/pci/controller/pcie-rcar.c +++ b/drivers/pci/controller/pcie-rcar.c @@ -283,8 +283,8 @@ static int rcar_pcie_read_conf(struct pci_bus *bus, unsigned int devfn, else if (size == 2) *val = (*val >> (8 * (where & 2))) & 0xffff; - dev_dbg(&bus->dev, "pcie-config-read: bus=%3d devfn=0x%04x where=0x%04x size=%d val=0x%08lx\n", - bus->number, devfn, where, size, (unsigned long)*val); + dev_dbg(&bus->dev, "pcie-config-read: bus=%3d devfn=0x%04x where=0x%04x size=%d val=0x%08x\n", + bus->number, devfn, where, size, *val); return ret; } @@ -302,8 +302,8 @@ static int rcar_pcie_write_conf(struct pci_bus *bus, unsigned int devfn, if (ret != PCIBIOS_SUCCESSFUL) return ret; - dev_dbg(&bus->dev, "pcie-config-write: bus=%3d devfn=0x%04x where=0x%04x size=%d val=0x%08lx\n", - bus->number, devfn, where, size, (unsigned long)val); + dev_dbg(&bus->dev, "pcie-config-write: bus=%3d devfn=0x%04x where=0x%04x size=%d val=0x%08x\n", + bus->number, devfn, where, size, val); if (size == 1) { shift = 8 * (where & 3);