From patchwork Thu May 20 09:21:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 443166 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2111156jac; Thu, 20 May 2021 02:26:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzhC6df2g+3u6NFro7UTSKTOoXAvdsmgaG56rhPJFH1dn0KGR0a8Ii8ZG7vl9inhsBc4siX X-Received: by 2002:a92:3f08:: with SMTP id m8mr4132282ila.154.1621502793491; Thu, 20 May 2021 02:26:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621502793; cv=none; d=google.com; s=arc-20160816; b=FCSI9Wlm/aUQsvpohn5gq4Wuj+Ep7AY7wqPaU7TfwzILCgStnbqycJGTFlinKn2Xfw Dq6Qo6gcioYl/VLzv/UmB0cSW5ss/bOUskUXc1RkVi0eOg1iHVJi4nt1PbAf+nRbYJWF vvoORXGRRym2whm0UhUZaZea9Niju3U4zfmacI5L2X7Jn0271V+dbYImjp275lkE+Ew4 Et1M5z4T0AECtqBrn7W72SO4a+ckZLOHt2zhhIUJFY0oiUk/kmbc2Udqz3O8ZhYxFRw9 XjSCzn09paSp861ZPVHXsgIdt3H6n2MlexP06j3F+JvV0uuK0lwDHxQPB1AExBmAgw3H xovQ== 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=Po6zTOhOLYA5jU+3kxUZdxeZ3yfMW+3636NLJRJciag=; b=xCnsXW5p2OvYQf4ZYKFPAmNP+rsTxlNV9XYEWM4Scca9zSrIPDF3n1BlI8VtQwBUyd HdIDF9Oi+oEpb2VvXgNkwU/T8vU2Y26nXHhKF2zuCi2Kg/eZiOmMZYPQP5rCQwSxj2q+ aOn+Q17b59jeblvDsYEMRwXc6rVyQsNyQv/PQVMHUXSJ46jZ9wK1U/JWiFxGYsViA/1K 3L63XSdzfE2/9DPF8VwjhIDWg3EbtugVJ5iS0E2MHeeCyEEWxrj1f4kpGHldvyk1UMHJ 0qOogMGeGDSXIg9TXVAHcNV/gH+Xrxd1RmqXZGyAdvkc+acomuW9Xh8ByQorxQhqKvXh lCFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Zb6oW45n; 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 y16si2028848jad.62.2021.05.20.02.26.33; Thu, 20 May 2021 02:26:33 -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=Zb6oW45n; 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 S232040AbhETJ1x (ORCPT + 12 others); Thu, 20 May 2021 05:27:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:53892 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231766AbhETJ1D (ORCPT ); Thu, 20 May 2021 05:27:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CAE3E6135B; Thu, 20 May 2021 09:25:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621502742; bh=GutPSzuUf6F85g4iftkRTz0U4z28x4+3K52tl2pDK/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zb6oW45n3j6yiuVUKE2jkRkzax1BHL9aISXNwi910kIt6a8ypqw9Ya5FeGV/EoT+4 E1DSaEewA3sRtDpNeMxVmo0Ug6Bu09jwAyNgjIVkt7nr5+GP+5dkKAReAgydQ/RS+n jQK1s6X88foHnxJTJdgutbRlEfSYT5MeE+zyD60U= 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.12 07/45] PCI: thunder: Fix compile testing Date: Thu, 20 May 2021 11:21:55 +0200 Message-Id: <20210520092053.761027764@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092053.516042993@linuxfoundation.org> References: <20210520092053.516042993@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 f964fd26f7e0..ffd84656544f 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 1a3f70ac61fc..0660b9da204f 100644 --- a/drivers/pci/controller/pci-thunder-pem.c +++ b/drivers/pci/controller/pci-thunder-pem.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "../pci.h" #if defined(CONFIG_PCI_HOST_THUNDER_PEM) || (defined(CONFIG_ACPI) && defined(CONFIG_PCI_QUIRKS)) @@ -324,9 +325,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; @@ -334,9 +335,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 ef7c4661314f..9684b468267f 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -624,6 +624,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 int pci_rebar_get_current_size(struct pci_dev *pdev, int bar);