From patchwork Thu May 20 09:22:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 443174 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2115349jac; Thu, 20 May 2021 02:32:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxK+6CAQrFInFr2fFfbPahFfsupQ/A3fQwUpxk/BafI4O9BuRTPxNkMqfPVFLSK+PsKZr1K X-Received: by 2002:a17:907:927:: with SMTP id au7mr3813477ejc.267.1621503139202; Thu, 20 May 2021 02:32:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621503139; cv=none; d=google.com; s=arc-20160816; b=Ie41rjNR7RtkhQkOlQxegsshv3uSx4chUO/aVNxaKWhO9FvzXjZMnZDyBsbg4Ka7ao Nc7xQnpH0cT4woVBL3H3+doe9WJC/D/1nAJTi+Zvx9KHHesQT4AUHPuucisfHw4ZzwE1 uX3rZPVCz1VWuskG8D/2eEP5fqQBOPQRO/BbDi3BNK0RnfHH9fSaVhN0VJB7fJtT2mJD 68WwsyXsdsbX7hMXORczkNErro9YHTFqAwU0T8e6a0qjDCbQjaRye5wA0lz4zJgx3/Wt /taqlh5fDJ0J+lCocNX3nhTMblSOPdfH67wgG/kXarSz8uvOC89rXVDRe+3den+ZfUZ3 yKwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tv3m4t1RbHlFTb3BvsUfdm+fnn309ZpWB+EnBxsIl+A=; b=EZRRi7Zhsttwuffuqc/EdrlG+VKWLkVFXXans9M7m9tMfOFQwhxl9WApw4h76yTTT+ EYzl0ASWlQepl/4sDNr51wOOiJqLh+LxDp3EXWq3pInI3djXD1pujvhlaAIZHqIs6mp7 nfADwS3G4x0eulmJINCjl+G82GwYHu2V/o8Ajwco6Ld1oaGsw3xVA9qBAf0nYr6T6go2 MwufsfV9SzAz5jFW8cQly5e38jh+RFzP38+x9c1WD3L8W+MaX81W4kKIRCEJRCExVYXG kwtNzskhsrtJQQYNCCRcjNZ1Qd4YmYVkCwBA2q1LBjIexXQBdmqr3mLxwNrDvmSVYqZ5 suDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bY7V7HQP; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t23si2430765ejs.86.2021.05.20.02.32.19; Thu, 20 May 2021 02:32:19 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bY7V7HQP; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231875AbhETJdi (ORCPT + 12 others); Thu, 20 May 2021 05:33:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:60418 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232108AbhETJbt (ORCPT ); Thu, 20 May 2021 05:31:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A0AF7613E5; Thu, 20 May 2021 09:28:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621502885; bh=eN04/AW2PEcrYxJ8E8JcqPxfOpcx4dRmcXbZaH+Fb6M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bY7V7HQPE3mwY3oKXAhYzJLzC2Q4C6yYyjxSTusahE6PIM4erjV5jhyD9HaWCeP// ADqBa/NwS2hdCJQ+joVm6eczMtDqhwBVnpgnuOnTJEWFU21BFZcrgVgogsHw42x7rK o1BKS+2wBU5gtpYlEkxvBYRfumPWq1c1GLnSGBY4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Bjorn Helgaas , Kuppuswamy Sathyanarayanan , Robert Richter , Sasha Levin Subject: [PATCH 5.4 10/37] PCI: thunder: Fix compile testing Date: Thu, 20 May 2021 11:22:31 +0200 Message-Id: <20210520092052.600959913@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092052.265851579@linuxfoundation.org> References: <20210520092052.265851579@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 16f7ae5906dfbeff54f74ec75d0563bb3a87ab0b ] Compile-testing these drivers is currently broken. Enabling it causes a couple of build failures though: drivers/pci/controller/pci-thunder-ecam.c:119:30: error: shift count >= width of type [-Werror,-Wshift-count-overflow] drivers/pci/controller/pci-thunder-pem.c:54:2: error: implicit declaration of function 'writeq' [-Werror,-Wimplicit-function-declaration] drivers/pci/controller/pci-thunder-pem.c:392:8: error: implicit declaration of function 'acpi_get_rc_resources' [-Werror,-Wimplicit-function-declaration] Fix them with the obvious one-line changes. Link: https://lore.kernel.org/r/20210308152501.2135937-2-arnd@kernel.org Signed-off-by: Arnd Bergmann Signed-off-by: Bjorn Helgaas Reviewed-by: Kuppuswamy Sathyanarayanan Reviewed-by: Robert Richter Signed-off-by: Sasha Levin --- drivers/pci/controller/pci-thunder-ecam.c | 2 +- drivers/pci/controller/pci-thunder-pem.c | 13 +++++++------ drivers/pci/pci.h | 6 ++++++ 3 files changed, 14 insertions(+), 7 deletions(-) -- 2.30.2 diff --git a/drivers/pci/controller/pci-thunder-ecam.c b/drivers/pci/controller/pci-thunder-ecam.c index 32d1d7b81ef4..18715d2ce022 100644 --- a/drivers/pci/controller/pci-thunder-ecam.c +++ b/drivers/pci/controller/pci-thunder-ecam.c @@ -116,7 +116,7 @@ static int thunder_ecam_p2_config_read(struct pci_bus *bus, unsigned int devfn, * the config space access window. Since we are working with * the high-order 32 bits, shift everything down by 32 bits. */ - node_bits = (cfg->res.start >> 32) & (1 << 12); + node_bits = upper_32_bits(cfg->res.start) & (1 << 12); v |= node_bits; set_val(v, where, size, val); diff --git a/drivers/pci/controller/pci-thunder-pem.c b/drivers/pci/controller/pci-thunder-pem.c index f127ce8bd4ef..1650ec2c35f9 100644 --- a/drivers/pci/controller/pci-thunder-pem.c +++ b/drivers/pci/controller/pci-thunder-pem.c @@ -11,6 +11,7 @@ #include #include #include +#include #include "../pci.h" #if defined(CONFIG_PCI_HOST_THUNDER_PEM) || (defined(CONFIG_ACPI) && defined(CONFIG_PCI_QUIRKS)) @@ -314,9 +315,9 @@ static int thunder_pem_init(struct device *dev, struct pci_config_window *cfg, * structure here for the BAR. */ bar4_start = res_pem->start + 0xf00000; - pem_pci->ea_entry[0] = (u32)bar4_start | 2; - pem_pci->ea_entry[1] = (u32)(res_pem->end - bar4_start) & ~3u; - pem_pci->ea_entry[2] = (u32)(bar4_start >> 32); + pem_pci->ea_entry[0] = lower_32_bits(bar4_start) | 2; + pem_pci->ea_entry[1] = lower_32_bits(res_pem->end - bar4_start) & ~3u; + pem_pci->ea_entry[2] = upper_32_bits(bar4_start); cfg->priv = pem_pci; return 0; @@ -324,9 +325,9 @@ static int thunder_pem_init(struct device *dev, struct pci_config_window *cfg, #if defined(CONFIG_ACPI) && defined(CONFIG_PCI_QUIRKS) -#define PEM_RES_BASE 0x87e0c0000000UL -#define PEM_NODE_MASK GENMASK(45, 44) -#define PEM_INDX_MASK GENMASK(26, 24) +#define PEM_RES_BASE 0x87e0c0000000ULL +#define PEM_NODE_MASK GENMASK_ULL(45, 44) +#define PEM_INDX_MASK GENMASK_ULL(26, 24) #define PEM_MIN_DOM_IN_NODE 4 #define PEM_MAX_DOM_IN_NODE 10 diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index a5adc2e2c351..572c2f0a2f0c 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -588,6 +588,12 @@ static inline int pci_dev_specific_reset(struct pci_dev *dev, int probe) #if defined(CONFIG_PCI_QUIRKS) && defined(CONFIG_ARM64) int acpi_get_rc_resources(struct device *dev, const char *hid, u16 segment, struct resource *res); +#else +static inline int acpi_get_rc_resources(struct device *dev, const char *hid, + u16 segment, struct resource *res) +{ + return -ENODEV; +} #endif u32 pci_rebar_get_possible_sizes(struct pci_dev *pdev, int bar);