Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Laurentiu Tudor <laurentiu.tudor@nxp.com>
To:     linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org
Cc:     diana.craciun@nxp.com, ioana.ciornei@nxp.com,
        anda-alexandra.dorneanu@nxp.com,
        Laurentiu Tudor <laurentiu.tudor@nxp.com>
Subject: [PATCH v2 2/2] bus: fsl-mc: MC control registers are not always available
Date:   Wed, 16 Sep 2020 13:52:13 +0300
Message-Id: <20200916105213.18625-2-laurentiu.tudor@nxp.com>
In-Reply-To: <20200916105213.18625-1-laurentiu.tudor@nxp.com>
References: <20200916105213.18625-1-laurentiu.tudor@nxp.com>
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from fsr-ub1864-101.ea.freescale.net (83.217.231.2) by AM0P190CA0009.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3391.11 via Frontend Transport; Wed, 16 Sep 2020 10:52:24 +0000
X-Mailer: git-send-email 2.17.1
X-Originating-IP: [83.217.231.2]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 9877f98b-d638-4759-89be-08d85a2e9900
X-MS-TrafficTypeDiagnostic: VI1PR0401MB2318:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <VI1PR0401MB23181BC71E9424A7E54E0EFDEC210@VI1PR0401MB2318.eurprd04.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:289;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: lGTxKf6tGZYC1DOhfM9xRtLhO3tQ8Z8hLJJGlyUXon2xkaKtckSngLlvY6QVzoeV0M/k7x3khykXIk0R5MRDxHreXXP9O6zNZd6y0W7iYA/CJAPbgZRQLJypfovduOmQ7+ZNH/gHM7vHOwfPzq3UneO4vfESGikaDu8ppusozwm+kl/14+BDsnH2Zz47nKbupMeqcsUbbHdWSxy3FyciOhPmc5cuWOQYtwi9tlL5s3F+wQ83VGs01x8m6fMwyJ59N+38qjzfC0kfxImlr9MH5DZ4xVqgJzBAie1huOZos0T+TDBbRx6dSB2/oMEerrBHr7JM7Htuk09Q5dHInXyAlAB3PtFcE8JsY9VRAgE6gagRYqsjDOpKdj9QtLpmoF3k
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3405.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(396003)(376002)(39850400004)(346002)(136003)(66476007)(66946007)(8676002)(44832011)(2906002)(66556008)(52116002)(6666004)(83380400001)(6512007)(86362001)(8936002)(16526019)(6506007)(186003)(6486002)(26005)(36756003)(4326008)(1076003)(5660300002)(478600001)(956004)(316002)(2616005);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: D/rklZ6lunMcdu/DLSg3gzZmCZB45yUf7bzmDpAgPP/TLS4/J2djcW43wcm/6/yST/d31ivcaZ6txDpQqviQ93fhzxJnCDm8x7TRpJMywn1BdhIl74osY06NpFJddtv86jSCAAdxff9oNaNwONWjLl7hLajGpdftmiYwMY2IvqvlXfMpOKCqod7mmUeGbQe3GzksXuN2AaMAFJ34HrBP5ROKiDwVL1ZBB5922+aAH7ylj+lXlrEVn1GR63ppl36o8swuZbqR9OqA+Z3LjivPXoILYZ8Nolc/SfcgS2vnfPJ7rgErDjXV6cNL6J+VbIE/Jm+tJWGoQrS9NQdyxe9Djqe6+e8vS8+Ui+AAjwkxug5LBK9KzlzFc1iPVpxKOwY1s3rQjNpctiNgFtfOwRN0U1c4Fm/siz8eNiMmWD8B2FPliw1yeRjtEKa31OHmoIdY0Wwd1YBjzUwbeWZRq3NzNd9lT2pZvr+Rp2volzd24Zx1wkPVIbxh0CUuc9PLYdy/vnvdj7z15MhsGOjuGLoKRkHorBq1ESwTxgSWNU/QrX/WTrpgFILmEiIkG7tM5BXAqvtjnUD/NFkQbP+LsHiZi6fTm0k6nRGYQushjJ5Mzbp6EuhzKgxBDRKtBDJ03l5ScBwr2eEmdI3mbGrCRyyvAg==
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9877f98b-d638-4759-89be-08d85a2e9900
X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3405.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2020 10:52:25.8158
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 2fMxUoO9Aq30JmE1CAczLbIlwlMfe172lqIPJx5nT/mVGNc0VCGqP+Mqqmqc39yZOD8s/uPJ1t50bgaeTxNzzg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2318
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

As per the device tree binding, in certain scenarios such as
virtualization scenarios, the MC control registers are not
available so don't error out if they are not present.

Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
---
Changes in v2:
 - dropped useless NULL check
 - restore IS_ERR() usage

 drivers/bus/fsl-mc/fsl-mc-bus.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c
index b0449df117e8..b4177eccbf50 100644
--- a/drivers/bus/fsl-mc/fsl-mc-bus.c
+++ b/drivers/bus/fsl-mc/fsl-mc-bus.c
@@ -916,10 +916,9 @@ static int fsl_mc_bus_probe(struct platform_device *pdev)
 
 	plat_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
 	mc->fsl_mc_regs = devm_ioremap_resource(&pdev->dev, plat_res);
-	if (IS_ERR(mc->fsl_mc_regs))
-		return PTR_ERR(mc->fsl_mc_regs);
 
-	if (IS_ENABLED(CONFIG_ACPI) && !dev_of_node(&pdev->dev)) {
+	if (!IS_ERR(mc->fsl_mc_regs) && IS_ENABLED(CONFIG_ACPI) &&
+	    !dev_of_node(&pdev->dev)) {
 		mc_stream_id = readl(mc->fsl_mc_regs + FSL_MC_FAPR);
 		/*
 		 * HW ORs the PL and BMT bit, places the result in bit 15 of
-- 
2.17.1