From patchwork Tue Oct 27 13:51:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 312904 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BACBBC388F9 for ; Tue, 27 Oct 2020 14:35:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5CDFC22264 for ; Tue, 27 Oct 2020 14:35:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603809354; bh=c6pyjhmpCq6DSaXPjXLDNWWwd28gwvUHHbyN54VsoXk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CdHJEnSk6dxnICVIe8/Hy1/TyYbtnkNZEKSsHRsuGSWOBoZmxfAjwvS2VosThwMfS wxWvfFDnluqpLIsLvv7TE+IolqasmyEIEDrEhLDsHlbaVGp4VGLtRLHC0mWbYt1Ykg dQYX0mqnhPKnCkm/sMy2BQweKKNj0VrkhX4KpWe8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760680AbgJ0Ofv (ORCPT ); Tue, 27 Oct 2020 10:35:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:34624 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760674AbgJ0Ofu (ORCPT ); Tue, 27 Oct 2020 10:35:50 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B2E2B207BB; Tue, 27 Oct 2020 14:35:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603809349; bh=c6pyjhmpCq6DSaXPjXLDNWWwd28gwvUHHbyN54VsoXk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DPyPJxWgXSGfEMLhUu3X18w+kmR5hTxU1h50UWBlAGpMkM3BJTs/zX7kNSqoBrwnD uIMzlhsLQP5mr0NC0iwjqqjuDvg9om42QpRskoz5S9M2TlFmW5KH0Ps0M3vjDDYwGi tenGFUoqagNHSjXqoHzTEpj/OLq2YtSsZQJXlqls= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Srinivas Kandagatla , Sasha Levin Subject: [PATCH 5.4 165/408] slimbus: core: check get_addr before removing laddr ida Date: Tue, 27 Oct 2020 14:51:43 +0100 Message-Id: <20201027135502.757028011@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135455.027547757@linuxfoundation.org> References: <20201027135455.027547757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Srinivas Kandagatla [ Upstream commit f97769fde678e111a1b7b165b380d8a3dfe54f4e ] logical address can be either assigned by the SLIMBus controller or the core. Core uses IDA in cases where get_addr callback is not provided by the controller. Core already has this check while allocating IDR, however during absence reporting this is not checked. This patch fixes this issue. Fixes: 46a2bb5a7f7e ("slimbus: core: Add slim controllers support") Signed-off-by: Srinivas Kandagatla Link: https://lore.kernel.org/r/20200925095520.27316-2-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/slimbus/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/slimbus/core.c b/drivers/slimbus/core.c index 63ee96eb58c68..42a233fc5dc6c 100644 --- a/drivers/slimbus/core.c +++ b/drivers/slimbus/core.c @@ -327,8 +327,8 @@ void slim_report_absent(struct slim_device *sbdev) mutex_lock(&ctrl->lock); sbdev->is_laddr_valid = false; mutex_unlock(&ctrl->lock); - - ida_simple_remove(&ctrl->laddr_ida, sbdev->laddr); + if (!ctrl->get_laddr) + ida_simple_remove(&ctrl->laddr_ida, sbdev->laddr); slim_device_update_status(sbdev, SLIM_DEVICE_STATUS_DOWN); } EXPORT_SYMBOL_GPL(slim_report_absent);