Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp485300pxx; Wed, 28 Oct 2020 09:23:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzDsIJhRB0ZIMBm/KhgyTN4RgeVFTcIo36DC25Qd8hgWxWYsUFaMe7cYfzBMjrooYVG5/dX X-Received: by 2002:a05:6402:142c:: with SMTP id c12mr8944528edx.41.1603902190519; Wed, 28 Oct 2020 09:23:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603902190; cv=none; d=google.com; s=arc-20160816; b=KysTgzRTXjIolRhCG+Q7hWL3YDpD2Xc/JrNeD5ol+oK9gvT9OygFjh+WSasbTM1tbc 6X1n51/iSVidj8gLXshVQorUNG7AET0NZ9JvAFkqZnbixdn7+UkMUSMGaQzfihKw9CHG SeljjNHEWoJqIeQbvUWOtkqjL58AEhnLoGZfsmdxqXy7Yf5bDdroYtFzjjyxyoFXSVBw UYV6VBE70bkuSjif/eIJvnbSExn/Oid1gill+OnXxrs8e1w3Vq5DzdzOYo5pmiSUl2Is mNTXLKRNQpDW8WgUXwMEf+g0J6h1cy59f1yK/NbI9S1mRd+Uv6gWA6HCPsNUtR1pt25s 2Rsw== 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=w+CylFVXbRtj74HnvkRMJ56T+aplXDYvT4Bo86j4n7Q=; b=0uAYA/pU+7+wDrTJDI+y/zCEdVOjJTRT9TrNdcyYbyOsXxHsQcMsocHYs3GInMkPKG UdJeuZagInDNYUMz8A+QE6spjTzD0prAGCGeq1WlxHwt74wzYt46OzDZu4/8JfKgtd/j HaEjbY+Jz++sMeJPPh5r3ayOM5spQ8Lt86OjTJ6euAqBapYjbNNJSVv8ZNnb1gaqeudJ QMt15VS689MkgjFS6JTC6D9xTm+L4fwUuShpmmDL+jJLWVwR6oSoJhHrruDkidMjP6xH 8dpespScnZVWnsXnxGbHwwIBdw5dDNBDxtN0qov3JbDr1UpPbhJ6MW7bQI+zBn/T/d8P 6ngA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZvFzX8gH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (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 dm2si3793647ejc.295.2020.10.28.09.22.46; Wed, 28 Oct 2020 09:23:10 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZvFzX8gH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1816608AbgJ0RIA (ORCPT + 99 others); Tue, 27 Oct 2020 13:08:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:33490 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1787423AbgJ0PAI (ORCPT ); Tue, 27 Oct 2020 11:00:08 -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 58FB920714; Tue, 27 Oct 2020 15:00:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603810808; bh=FxsYMJh5GcWQ2EJ+/uAx3LwJ1jKoEX3seiWRCNptn3o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZvFzX8gHjaRto8KhQ3RXfiFwHt9QE1mf0vSphcqWq5mcKNE+O32vCnoeFlS5IPcBP MOhpln4wTXVKmtuzfef8gE+Cp3lSLLznSX7HSHgjdjp5aeC8Z2zYmNNTMB5Tn7XoX/ gf2N/Md7Vs8Gm52wuDatx8mM750NHHrkxCP9U47U= 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.8 270/633] slimbus: core: check get_addr before removing laddr ida Date: Tue, 27 Oct 2020 14:50:13 +0100 Message-Id: <20201027135535.332630448@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 ae1e248a8fb8a..58b63ae0e75a6 100644 --- a/drivers/slimbus/core.c +++ b/drivers/slimbus/core.c @@ -326,8 +326,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); -- 2.25.1