From patchwork Thu May 20 09:22:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 443167 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2111862jac; Thu, 20 May 2021 02:27:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwWW6RYHno2j/m5nbJf6qGWtnbrmr5e7G2QSLx4ByUIf7pQVtLcMaHQNoraamxJZwIolmpR X-Received: by 2002:a92:b746:: with SMTP id c6mr4637689ilm.240.1621502847570; Thu, 20 May 2021 02:27:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621502847; cv=none; d=google.com; s=arc-20160816; b=Z16Q7n5ASC8P4E3CqaW4AdC+4QeksJQjA7XCvspYYXoIKpLwkY5QyImnNDMVK6KBvn yxegc7JVCO1S7S1Dfn9MeOfEaqPQ5Nr+ZI2PIVdIIZiid/jQKhLpnrepDBYzjytM0AVF 1tEyRFzBOLC79mx7rBbOzK/WPq3jbNBplcvnRVBwMh1khv19deJk1+tVXGOXY9l92Ko1 3/3N87v3MoY52fxwi1c3my7YiNG/YyeRWC6Isqn2T/bBCNyoLwWDrbb2/JgMR+qo0Y0m +HSsrP8G5qorf2moi1yuR/67KrjCoWDoaYbKsLBGseLOIISbL08zUvp4JiygMAyixQvu imEA== 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=vRSvBSOUjiSmXItk5GSBm7RFF7S80KFPdjT5LBuaTDA=; b=wANOUVLn271JUqwvB0BedpJKNj5HXTr6zL+s6TdW8ibXo33ekgAQSTc8w8LUYZ3H2X QKZgdmea2jmLtLo1D5SWovXoHoH//oVetUh1jSQkagn6WcJTweOKi6lV+84UixdgZNeQ PDhlWn9oBRjT1oYSF6FNSSBjBsBnVOfA6ZAazghDMSYUzUU5UW0ZVwA+wVK9ck/X4gng MQ0+BvcaybC59qzQ5UkVFQygPlfSwB+sPyrB+ywAUF4poVthLizOfU9OhIZdN8weRy0T iKrJBEgWrPZhGh1GwhAqPzB+Q6TBcbfoIKy7tPaddyWba4iJG+PYs+JswFZDHIBvE7Nc 54GA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=W6xBV2Z+; 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 d70si2002709iog.4.2021.05.20.02.27.27; Thu, 20 May 2021 02:27:27 -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=W6xBV2Z+; 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 S232000AbhETJ2p (ORCPT + 12 others); Thu, 20 May 2021 05:28:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:52732 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232021AbhETJ1n (ORCPT ); Thu, 20 May 2021 05:27:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 680CE613B6; Thu, 20 May 2021 09:26:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621502779; bh=ZS5OhBg/T4BfvVRuuVPob80P71kYOtIlYk1gRfrP6P8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W6xBV2Z+DZpwmdQrOsAFOuO+zkzfkiFdoeghU3kmkzplaNZMJR4D20YoqD6ByCk5I kwsBdKjzBMmtQUXsYB/GBRBIOiYsoRdW04KsvTNACRhwPRlLd+uhUS/FtbVrfqDIuP MknU08lhZAs/QrAPVO3IualdoI3qoFEX0ozEgJ8Q= 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.10 10/47] PCI: thunder: Fix compile testing Date: Thu, 20 May 2021 11:22:08 +0200 Message-Id: <20210520092053.887183963@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092053.559923764@linuxfoundation.org> References: <20210520092053.559923764@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 7e8835fee5f7..d79395881d76 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 3f847969143e..4b12dd42bf23 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)) @@ -315,9 +316,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; @@ -325,9 +326,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 f86cae9aa1f4..09ebc134d0d7 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -606,6 +606,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);