Received: by 2002:ac0:aa62:0:0:0:0:0 with SMTP id w31-v6csp1952147ima; Thu, 25 Oct 2018 07:29:31 -0700 (PDT) X-Google-Smtp-Source: AJdET5cL3QKW8ZcPCrl047igcl5GPbBQnuDJs8fgi6dSQC/34yhjq7835xIIH4T8jDoL1DZRWJxz X-Received: by 2002:a63:b305:: with SMTP id i5-v6mr1690908pgf.46.1540477771275; Thu, 25 Oct 2018 07:29:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540477771; cv=none; d=google.com; s=arc-20160816; b=dAI9nPmYaMYBMJGCa3HqS9yNgkBoTTy4VTgvTawsRPMNY8JwZBRxVbAsHbDh8/7vxh rPkeOAaE6dBBCBAdt0W6ObUQ9giVuXtu0uMQyJqp+jmklX7bp3mmIIXU2tb/xaeGFpwX CO+u17hKconMDQm6M6pFMpddnsABMOywISo92OKLp2sytzPnRqzvtWzxFZ+f1DHyL2Uq KO7rb4Ewss472Vev9zqBdUJLXUyLEOCT2UuDyZycDIu99kvgeL9OVchAzKPWKLbC0WmC Hi5BOc+JEFY/rBb4uMMOj1GoAqBvp2sgy+FLT2tVs8VQrTC7DwsP0KylS6ToYL4ctoez eSEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=EHnyg7XilBepoAZ6BZqGKx9Uhmpd4e8hVoLcVvX3l1M=; b=L7i6D6gOnbQIDFm/h7DJlO/TDQxBpHOrn19FY1phPHKw8jqO7XV5nxwDgm8lryCvB8 S/WiaK4RW6gJ3C9/i4romCaPNrUrRySupanb4OsvslFTe5hEldNUXJ1sQ7DyQEXmYsBd DokAoemLBOJ9viKLY/EeR6jwjY/VKyhnl2KWZbC9UB8mYsP8A7mP62BZMI5/3pN5TqQe APXddQy109T0j7YjR3mwGEwcOx9zqdZfg63Aw59Kn/hFMSNNdavnLqITbQOzUaAzEKqd lRJDv6D+6NfpCcn1sdzSR6t/LSgqItXwVSbCdtMCeir0mi5j/s/3uvqvy8sdkPK3QZBe muNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RabTINq8; 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 l14-v6si8222696pgi.34.2018.10.25.07.28.56; Thu, 25 Oct 2018 07:29:31 -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=RabTINq8; 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 S1730882AbeJYWxI (ORCPT + 99 others); Thu, 25 Oct 2018 18:53:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:35482 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730254AbeJYWxH (ORCPT ); Thu, 25 Oct 2018 18:53:07 -0400 Received: from sasha-vm.mshome.net (unknown [167.98.65.38]) (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 A046C208A3; Thu, 25 Oct 2018 14:20:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1540477209; bh=akc4dMTs9TtQepmontKA627ZOmmO2od+TePIoHcsMXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RabTINq8JsCfhi7Xi6fnM4N06i09CBFSv/8YgxcmTvk2OQE+xY8zbQiX5LbqAfCAR x6uL2h0ZH7PEPDOnExnv8SfFQB5ukpjcPSFyBu0fq+1y28MM3vMKRTHJR3l7TGUHpK dTR+KvFs/KirZrogrvIAYD+Cd0UAjz/JQh0FfccU= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Abhilash Kesavan , Olof Johansson , Sasha Levin Subject: [PATCH AUTOSEL 3.18 49/98] drivers: bus: check cci device tree node status Date: Thu, 25 Oct 2018 10:18:04 -0400 Message-Id: <20181025141853.214051-49-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181025141853.214051-1-sashal@kernel.org> References: <20181025141853.214051-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Abhilash Kesavan [ Upstream commit 896ddd600ba4a3426aeb11710ae9c28dd7ce68ce ] The arm-cci driver completes the probe sequence even if the cci node is marked as disabled. Add a check in the driver to honour the cci status in the device tree. Signed-off-by: Abhilash Kesavan Acked-by: Sudeep Holla Acked-by: Nicolas Pitre Tested-by: Sudeep Holla Tested-by: Kevin Hilman Signed-off-by: Olof Johansson Signed-off-by: Sasha Levin --- drivers/bus/arm-cci.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c index 7af78df241f2..99cad3ac38f2 100644 --- a/drivers/bus/arm-cci.c +++ b/drivers/bus/arm-cci.c @@ -976,6 +976,9 @@ static int cci_probe(void) if (!np) return -ENODEV; + if (!of_device_is_available(np)) + return -ENODEV; + cci_config = of_match_node(arm_cci_matches, np)->data; if (!cci_config) return -ENODEV; -- 2.17.1