Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp5650414img; Wed, 27 Mar 2019 12:26:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqwNG9UgoPH4iOvHGpcFyEzkaADJU/4dBKqUpuKwyVjlDCHj41jBoUIIRoM//DwmYPJAVnw9 X-Received: by 2002:a65:4846:: with SMTP id i6mr3463939pgs.132.1553714816991; Wed, 27 Mar 2019 12:26:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553714816; cv=none; d=google.com; s=arc-20160816; b=ly4fFdnPEUlBqJLfMaEag/VDHgIPzef9O2igQZNpw9VgpVQ67Xjfojb3l1LzJmI9Ql X5O9ITQsQqz5etsO6SyDVNZ3XV8ddwR4UUKpwo+IP1KVm5n+kb+g42vDBACyAHcjeIVV +idFjm+kv50Gz0ezbzzr5Iu+pKvjF5KrNAM0GLQ9FW3ynovS/OAztqAtsQbeLJfXI7B9 sS2uYwjYs4VmqSyaBicE8/yne+FSjZwq+qmVWM4tY2TJJdHnwzYKBjuMFtAxPC4Fr16q xEXX0tBpBaxiI2PjOemKE5Ru6cCjfeI5tgaDIjdthVeyPulpczqz9Vx7pgc3XHBA7x3S oKXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Ar/9zRHEClymGkJiI4R279YyzKDPdrhG1xx78A18xWA=; b=Z7gW/f540jNpuxh/qJNjzFDpgpq3Uo8OqUWcb1HoSm5p0sE6mxTZ+crnHU2Pw4cHsO fu2F625gh5dXMdmQORl11WQPkT/eI5Mk93+Imx/DG1vUYlfJywOP3Me4aUXXSctcp1F6 JsYBjljGaRrBanQedaFEtIXv7IR41jzG97BvJHEcSEzrXPEMu0Bnh5U9/AsXwDuYX/l3 kDTPD6DOY7ZhMC4DzhyksuKV/+9apPKE8PtSWUB3J+scNUTwwEKCCRtXyPVLMjty9xG1 aMrzKBT3WM9T7b4K2u5G4HN2sBiKYtFB+L15WjBSfOvAWN4XrUYkb0WcRvKP6UWzghja NcqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cghY5gvy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l1si2161883pff.206.2019.03.27.12.26.42; Wed, 27 Mar 2019 12:26:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cghY5gvy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387889AbfC0TZy (ORCPT + 99 others); Wed, 27 Mar 2019 15:25:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:46240 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387601AbfC0SFL (ORCPT ); Wed, 27 Mar 2019 14:05:11 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0E8F5217D9; Wed, 27 Mar 2019 18:05:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553709910; bh=Ke7PKD/eQdDk1TotwE2Zwkfq6hKB7erw5boECmEx25I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cghY5gvyWN6n2Y3eVVzFdsQ+vg0t28/A0nzI7fkjHYpJpDRsBlaqOAdOKvuhYeDvB dGEU+ivS9vCqoWpqmNxTnYmYMkZJpUqN77K3kKAyFcqCq0Th71dYf1mEa+8oxkHrQo iJJjBobRy3wVtq7V9cpiekReezxKZYhPSMsnMB+w= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Michael Ellerman , Sasha Levin , linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 5.0 106/262] powerpc/44x: Force PCI on for CURRITUCK Date: Wed, 27 Mar 2019 13:59:21 -0400 Message-Id: <20190327180158.10245-106-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327180158.10245-1-sashal@kernel.org> References: <20190327180158.10245-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Michael Ellerman [ Upstream commit aa7150ba378650d0e9d84b8e4d805946965a5926 ] The recent rework of PCI kconfig symbols exposed an existing bug in the CURRITUCK kconfig logic. It selects PPC4xx_PCI_EXPRESS which depends on PCI, but PCI is user selectable and might be disabled, leading to a warning: WARNING: unmet direct dependencies detected for PPC4xx_PCI_EXPRESS Depends on [n]: PCI [=n] && 4xx [=y] Selected by [y]: - CURRITUCK [=y] && PPC_47x [=y] Prior to commit eb01d42a7778 ("PCI: consolidate PCI config entry in drivers/pci") PCI was enabled by default for currituck_defconfig so we didn't see the warning. The bad logic was still there, it just required someone disabling PCI in their .config to hit it. Fix it by forcing PCI on for CURRITUCK, which seems was always the expectation anyway. Fixes: eb01d42a7778 ("PCI: consolidate PCI config entry in drivers/pci") Reported-by: Randy Dunlap Reviewed-by: Christoph Hellwig Signed-off-by: Michael Ellerman Signed-off-by: Sasha Levin --- arch/powerpc/platforms/44x/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig index 4a9a72d01c3c..35be81fd2dc2 100644 --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig @@ -180,6 +180,7 @@ config CURRITUCK depends on PPC_47x select SWIOTLB select 476FPE + select FORCE_PCI select PPC4xx_PCI_EXPRESS help This option enables support for the IBM Currituck (476fpe) evaluation board -- 2.19.1