From patchwork Thu May 20 09:23:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 443217 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2165779jac; Thu, 20 May 2021 03:43:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJM8hE5qVGjM5AhQ43icyyJqyMh+LVMWTg0CVBRCwfVureW+jkj0JvN1Mjjoh4WMyZc8sn X-Received: by 2002:a05:6402:40c:: with SMTP id q12mr4247236edv.0.1621507425407; Thu, 20 May 2021 03:43:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621507425; cv=none; d=google.com; s=arc-20160816; b=tMDHKIFZ9mBq1WxFeuO7H25oCzQspHqRkFUUIFc6jT53ZmzHKNocxqGu2Bq6HzSjss MnAkEI0qSMbZviFoDQlhuOZeAziwrls2v1BqTCMU4IQABtqGdBUso8SCJxyITY4gJblI sEmloz5aLt6uYuHbvPYYpUqnroEdKP6Sr+L2Cq8L/wjF+2rz0fiWJoUcpvyrtbweRez7 b/1yfm+OzReE17u1QslG1KBNVsUcaPzHAVryZ9BM1uaPh1LVN/4yg/igjMDSb5XKzuAo qpefHuaquM8KZXE4Xv6I0XMXhj04IT5ypdAzeHd6WVCQDwKLEAoeO6Ni1bI1EyxdLjnW jSyw== 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=E8zCo+Dfp4F3U8FbJb59tznKiPAK8nsuckOYV7s3T5s=; b=cDjby7TB+NjATIOA+Qw7pl34IEdQRq6Pn9ql3fGHuNP8+pqEg21uGpjbL6Jq87Vs7p nK/VzwVjImzI03LYz5BLzgu7Xi8+wAL53mP2BCf1TroLJ6dzc/SK6AHMU2QGrvD2ftpp GzPsouwZn/sjxIjDfPMxpd3H4c03vfZ87eCpWm5oLbX6kaSc8q8ueHxVSu4p4MO6+iRL nz14AGOps4jJy6XecUQk6by2b+n0N0PeKpcVQQgSzbTwKVut6rjcLG9D0d7pRzzTPDia WDEQfEbP7iG3w+9jbv2tQgoawsX8bE9BJkiku/NrdQjw77K7Iyoz18WIpgQMFwtgdGz9 mm1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=fzchApox; 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 d2si2185285ejr.606.2021.05.20.03.43.45; Thu, 20 May 2021 03:43:45 -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=fzchApox; 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 S237444AbhETKpC (ORCPT + 12 others); Thu, 20 May 2021 06:45:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:45066 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236801AbhETKmN (ORCPT ); Thu, 20 May 2021 06:42:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0654061C94; Thu, 20 May 2021 09:56:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621504578; bh=dOLzFgUIgqX7vm/fLGl7274JZhoVscKvBtrwQ9gmqUY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fzchApoxK/Mye3CN6SY1x+SHkuGJEnqIZ49vChs/wCs2r2NksNxnVbkaRUo/N1BmE MEdZlvnpPJtrZdg5HLD0c8QQ04a3UiLqhhh0RzwcMXVRy8GRvSQMhfbCdpY8UJU3ur j2wW6+3FcGJPCS1g2iERE4CpzMTUoqobdD1GgEvA= 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.14 308/323] PCI: thunder: Fix compile testing Date: Thu, 20 May 2021 11:23:20 +0200 Message-Id: <20210520092130.791281878@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092120.115153432@linuxfoundation.org> References: <20210520092120.115153432@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/host/pci-thunder-ecam.c | 2 +- drivers/pci/host/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/host/pci-thunder-ecam.c b/drivers/pci/host/pci-thunder-ecam.c index fc0ca03f280e..ea4d12c76cfe 100644 --- a/drivers/pci/host/pci-thunder-ecam.c +++ b/drivers/pci/host/pci-thunder-ecam.c @@ -119,7 +119,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/host/pci-thunder-pem.c b/drivers/pci/host/pci-thunder-pem.c index 6e066f8b74df..1b133bf644bd 100644 --- a/drivers/pci/host/pci-thunder-pem.c +++ b/drivers/pci/host/pci-thunder-pem.c @@ -22,6 +22,7 @@ #include #include #include +#include #include "../pci.h" #if defined(CONFIG_PCI_HOST_THUNDER_PEM) || (defined(CONFIG_ACPI) && defined(CONFIG_PCI_QUIRKS)) @@ -325,9 +326,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; @@ -335,9 +336,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 fdb02c1f94bb..9f5215e25df4 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -365,6 +365,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 #endif /* DRIVERS_PCI_H */