From mboxrd@z Thu Jan 1 00:00:00 1970 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=-11.5 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_SANE_2 autolearn=unavailable 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 43E12C433E0 for ; Thu, 23 Jul 2020 15:30:58 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0ABD220714 for ; Thu, 23 Jul 2020 15:30:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="bx2tI23W" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0ABD220714 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=Huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=1+coF4sgkvAL8McZMNVkqY0RMsg4fiuLxWed2pyR1SI=; b=bx2tI23WRsBjORhCK1IMNKhN2 KwMKaWtOafcAe/HRyaLlAuRVnsloXPKk5OlyWs5G+aN9DcwgwyzEWF4CSF9DGzUbhtCHuDDHUfSd2 0aKcsbF0/Jn+eJzR7JywEeBKVZABDtUxwpIS5/vX+avtTX+UQrQT6gVtfOcyIvRftlI0mPbz67knw 9RBdBzKoq4dAWEsa3u5WGiodukWZShUZzzG4HALAyNYpS0GdD8u4LCFi7Z2lVFKcSY8cdU3TP6Mh/ UfiVI0Xd8RTgVk4KopmwyviX8BdKlEyKM5EjeImW3Fvrdha1ejVnsUC3Fg1VA8Iy7viOoSXHS6kk7 6A+grBWYA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jyd9Y-0008KK-4t; Thu, 23 Jul 2020 15:29:00 +0000 Received: from lhrrgout.huawei.com ([185.176.76.210] helo=huawei.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jyd7n-0007aD-3w for linux-arm-kernel@lists.infradead.org; Thu, 23 Jul 2020 15:27:13 +0000 Received: from lhreml710-chm.china.huawei.com (unknown [172.18.7.106]) by Forcepoint Email with ESMTP id C1F9118E7F6E686219A7; Thu, 23 Jul 2020 16:27:09 +0100 (IST) Received: from localhost (10.52.125.229) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1913.5; Thu, 23 Jul 2020 16:27:09 +0100 Date: Thu, 23 Jul 2020 16:25:48 +0100 From: Jonathan Cameron To: Gavin Shan Subject: Re: [PATCH v2 12/17] drivers/firmware/sdei: Remove _sdei_event_register() Message-ID: <20200723162548.0000576e@Huawei.com> In-Reply-To: <20200722095740.28560-13-gshan@redhat.com> References: <20200722095740.28560-1-gshan@redhat.com> <20200722095740.28560-13-gshan@redhat.com> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; i686-w64-mingw32) MIME-Version: 1.0 X-Originating-IP: [10.52.125.229] X-ClientProxiedBy: lhreml725-chm.china.huawei.com (10.201.108.76) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200723_112711_363329_A5943277 X-CRM114-Status: GOOD ( 19.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, catalin.marinas@arm.com, james.morse@arm.com, shan.gavin@gmail.com, will@kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, 22 Jul 2020 19:57:35 +1000 Gavin Shan wrote: > The function _sdei_event_register() is called by sdei_event_register() > and sdei_device_thaw() as the following functional call chain shows. > _sdei_event_register() covers the shared and privte events, but private > sdei_device_thaw() only covers the shared events. So the logic to > cover the private events in _sdei_event_register() isn't needed by > sdei_device_thaw(). > > Similarly, sdei_reregister_event_llocked() covers the shared and > private events in the regard of reenablement. The logic to cover > the private events isn't needed by sdei_device_thaw() either. > > sdei_event_register sdei_device_thaw > _sdei_event_register sdei_reregister_shared > sdei_reregister_event_llocked > _sdei_event_register > > This removes _sdei_event_register() and sdei_reregister_event_llocked(). > Their logic is moved to sdei_event_register() and sdei_reregister_shared(). > This shouldn't cause any logicial changes. > > Signed-off-by: Gavin Shan Otherwise looks good to me. Reviewed-by: Jonathan Cameron > --- > v2: Improved commit log > Drop changes to reorder the variables > --- > drivers/firmware/arm_sdei.c | 77 ++++++++++++++----------------------- > 1 file changed, 28 insertions(+), 49 deletions(-) > > diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c > index da0e0d5591a8..f4cd9791242f 100644 > --- a/drivers/firmware/arm_sdei.c > +++ b/drivers/firmware/arm_sdei.c > @@ -575,25 +575,6 @@ static void _local_event_register(void *data) > sdei_cross_call_return(arg, err); > } > > -static int _sdei_event_register(struct sdei_event *event) > -{ > - int err; > - > - lockdep_assert_held(&sdei_events_lock); > - > - if (event->type == SDEI_EVENT_TYPE_SHARED) > - return sdei_api_event_register(event->event_num, > - sdei_entry_point, > - event->registered, > - SDEI_EVENT_REGISTER_RM_ANY, 0); > - > - err = sdei_do_cross_call(_local_event_register, event); > - if (err) > - sdei_do_cross_call(_local_event_unregister, event); > - > - return err; > -} > - > int sdei_event_register(u32 event_num, sdei_event_callback *cb, void *arg) > { > int err; > @@ -616,7 +597,17 @@ int sdei_event_register(u32 event_num, sdei_event_callback *cb, void *arg) > } > > cpus_read_lock(); > - err = _sdei_event_register(event); > + if (event->type == SDEI_EVENT_TYPE_SHARED) { > + err = sdei_api_event_register(event->event_num, > + sdei_entry_point, > + event->registered, > + SDEI_EVENT_REGISTER_RM_ANY, 0); > + } else { > + err = sdei_do_cross_call(_local_event_register, event); > + if (err) > + sdei_do_cross_call(_local_event_unregister, event); > + } > + > if (err) { > sdei_event_destroy(event); > pr_warn("Failed to register event %u: %d\n", event_num, err); > @@ -633,33 +624,6 @@ int sdei_event_register(u32 event_num, sdei_event_callback *cb, void *arg) > return err; > } > > -static int sdei_reregister_event_llocked(struct sdei_event *event) > -{ > - int err; > - > - lockdep_assert_held(&sdei_events_lock); > - lockdep_assert_held(&sdei_list_lock); > - > - err = _sdei_event_register(event); > - if (err) { > - pr_err("Failed to re-register event %u\n", event->event_num); > - sdei_event_destroy_llocked(event); > - return err; > - } > - > - if (event->reenable) { > - if (event->type == SDEI_EVENT_TYPE_SHARED) > - err = sdei_api_event_enable(event->event_num); > - else > - err = sdei_do_cross_call(_local_event_enable, event); > - } > - > - if (err) > - pr_err("Failed to re-enable event %u\n", event->event_num); > - > - return err; > -} > - > static int sdei_reregister_shared(void) > { > int err = 0; > @@ -672,9 +636,24 @@ static int sdei_reregister_shared(void) > continue; > > if (event->reregister) { > - err = sdei_reregister_event_llocked(event); > - if (err) > + err = sdei_api_event_register(event->event_num, > + sdei_entry_point, event->registered, > + SDEI_EVENT_REGISTER_RM_ANY, 0); > + if (err) { > + sdei_event_destroy_llocked(event); > + pr_err("Failed to re-register event %u\n", > + event->event_num); > break; > + } > + } > + > + if (event->reenable) { > + err = sdei_api_event_enable(event->event_num); > + if (err) { > + pr_err("Failed to re-enable event %u\n", > + event->event_num); > + break; > + } > } > } > spin_unlock(&sdei_list_lock); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel