From patchwork Thu May 20 09:22:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 443203 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2145795jac; Thu, 20 May 2021 03:14:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmSubDIsnyAcOY6is3Su0doytDIfSbryXFlP+mejIF1407VDEkYvt3TNYayoh24dlpZMV/ X-Received: by 2002:a02:b68c:: with SMTP id i12mr5005366jam.133.1621505692075; Thu, 20 May 2021 03:14:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621505692; cv=none; d=google.com; s=arc-20160816; b=Drins3/D5II1omgoQk5/VPJLhYYqba9jhVZQDmGQzrkeOiJWiQzCPyLYpAkpsaSFlx JZH9xIdsqkKeBfdtFwYiUBC9YWwAdvrhWKQ7UY5Dzn3lWAWTeWQ/IltpIcrT/9gX55PP Qyku4jZWgwIERJNSR8PdXao9XfkY+fyUgk9ezVnvcCAosnryje8wY7QmldnIKgaJIx+c 5vIbh2Cq3wGd503KCI4YhMDvrJ/cZJRNDyUGvEMLnRs+w9P8A95NlQz06tJ164wyrysF 9LWxvk4EVMufRcGzUUKEsGXxAgdz+cjVzgw3c4FQfIvhS9R/ZTQnBqc6ouZlaFaPDXuX vU/w== 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=8eoshd6w1OS1ctMUaOu+mgEBiy8qVd8il3K5zTdfYh0=; b=sHFcVn4WcPuh3gU6KHjXUHKX7rDI8XKrTrwO6rN1/E/4yngNo4Tl+Lttmx2v0TLd5p Aree3W3IQYVrBX1umF6LK5rJ9OGtmADC86p8LB6ys7nIpyv70A+0UhQRDXOwT1mzrEET rcLomJH75vuTweaAeo05YpUTMl4cManPYyT2FDz33rOZHC0ta9kaJ+8uHWsCxFW5e1q7 5T7QAOGq4OZNYZus7f6BMcFdNK7EineM8eLQ3KMs+A3JEPtvr8FNEhu9K8a9kVRsbMwp jjeJLy6Jc2p/CUKBeZ/uDomin+i33aMch6I0+GN/KqxbFQOXhzzT5gEaTeoTZaik/ZnK CpvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tExs9au2; 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 c7si2418511ioi.54.2021.05.20.03.14.51; Thu, 20 May 2021 03:14:52 -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=tExs9au2; 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 S234877AbhETKQG (ORCPT + 12 others); Thu, 20 May 2021 06:16:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:47608 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236147AbhETKO1 (ORCPT ); Thu, 20 May 2021 06:14:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C4152613EE; Thu, 20 May 2021 09:44:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621503876; bh=LBtwEOIaJ4nCZqsS9YG3HNUNAC92HZWxjQNO35KTYu0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tExs9au2zorLTRIyG0ksRi1U6eawkmbyEt98UFT7MGxVs0zSRz8QKr8WFnvPGAnY2 KCRpTjsfDLYb6/xBDe75C3muz2zptXaCq7cZOlQ8IFKyV+i+lTfxwvi/36t7qK77gt XoZuQ2wIkj5Hjl/CU0Y/kr086/QNTXAxO54R/Ufc= 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 4.19 402/425] PCI: thunder: Fix compile testing Date: Thu, 20 May 2021 11:22:51 +0200 Message-Id: <20210520092144.604282929@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092131.308959589@linuxfoundation.org> References: <20210520092131.308959589@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 e9ede82ee2c2..39725b71300f 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -473,6 +473,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);