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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E95A2C00140 for ; Tue, 2 Aug 2022 12:57:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233153AbiHBM52 (ORCPT ); Tue, 2 Aug 2022 08:57:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232503AbiHBM51 (ORCPT ); Tue, 2 Aug 2022 08:57:27 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 95062D114 for ; Tue, 2 Aug 2022 05:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659445045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N0ZZ14S72xk5yxZHm4+yDho53ttCGeOI212a2GwS1G0=; b=eaB0biYkt6NH08b7Puk8KY6qS6eb6BwoajuvuLAJ3yi8T0Eo2gw5MY/Nnmc49Oq619QOOx jf/+ikKHNutLywdoU7R1JiGrHAcaAhaXqUMntG9V2ABR4YbDbADXM7FOFkPXU9f7tHKgJR z3UL1MGp+5ZiC/Ya7mNUUzDieGY37OI= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-654-FBid823WNKejxx4_KfX8qw-1; Tue, 02 Aug 2022 08:57:24 -0400 X-MC-Unique: FBid823WNKejxx4_KfX8qw-1 Received: by mail-ej1-f69.google.com with SMTP id g18-20020a1709065d1200b0073082300e1fso1803348ejt.12 for ; Tue, 02 Aug 2022 05:57:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:from:to:cc:references:in-reply-to :content-transfer-encoding; bh=N0ZZ14S72xk5yxZHm4+yDho53ttCGeOI212a2GwS1G0=; b=PzG2KfoChVRfmfO7ac887cg878YdDhGNUT8xrW2OcYEDD9vevdBIU/A4r59mQheIRw J3Yj40l/nfkb3tbBkTIGaKOVws1KuI4+IWv0/U2BOcXD06c/GMk8VewZustTG3MJCQpm 1q4ntlEDMsVJs+wdyp11uUaWE5L2fk7NQVqINGbaiCpRIDHeRDRIr7M7f4kUbdgQGCcH P+Ib90ImZjfA5qhT1sZDIbnH8HGO68fAZbfdv2PZSY0gC8CUHkDXxe/MJpeArCvQPk4y 3KG7awSjjr7wi8/ZJjZ6VnIUuBKcgsAqkzM6sBkSYNVSfEt5/0YxxkB+rcoz8qAfFTkE r2WA== X-Gm-Message-State: AJIora9QDrpxTLwF10jYSiZV2SAd5yvjKui4pmFnS6ZHwN8vt/R/2GbY ig+0EHiZvPCUO4L8/o9I9MQHq2C1GdkkGiYskiKH6NnFTb4gRAa2A91uW+52LHQmD3E3e89ubs/ Tqmla5HjO2pG8pxSCCmBLAaiBfD1gf6Qvzg== X-Received: by 2002:a05:6402:4414:b0:434:f58c:ee2e with SMTP id y20-20020a056402441400b00434f58cee2emr20412779eda.362.1659445043468; Tue, 02 Aug 2022 05:57:23 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uKHiZF+jj2kzLflvQkM2alQ4X9rGqt9QK7Vl/Jx23SnFnkuOJpAy8Es270cEo7/czSvDD97A== X-Received: by 2002:a05:6402:4414:b0:434:f58c:ee2e with SMTP id y20-20020a056402441400b00434f58cee2emr20412763eda.362.1659445043273; Tue, 02 Aug 2022 05:57:23 -0700 (PDT) Received: from ?IPV6:2001:1c00:c1e:bf00:d69d:5353:dba5:ee81? (2001-1c00-0c1e-bf00-d69d-5353-dba5-ee81.cable.dynamic.v6.ziggo.nl. [2001:1c00:c1e:bf00:d69d:5353:dba5:ee81]) by smtp.gmail.com with ESMTPSA id p15-20020a05640243cf00b0043d5ead65a6sm4953824edc.84.2022.08.02.05.57.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 Aug 2022 05:57:22 -0700 (PDT) Message-ID: <850a5498-52f3-239d-32b5-5494ee47e495@redhat.com> Date: Tue, 2 Aug 2022 14:57:22 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH v3 05/11] platform/x86/amd/pmf: Add heartbeat signal support Content-Language: en-US From: Hans de Goede To: Shyam Sundar S K , markgross@kernel.org Cc: platform-driver-x86@vger.kernel.org, Patil.Reddy@amd.com References: <20220802112545.2118632-1-Shyam-sundar.S-k@amd.com> <20220802112545.2118632-6-Shyam-sundar.S-k@amd.com> <4354d5fb-3fd0-7207-9f39-d7678744524c@redhat.com> In-Reply-To: <4354d5fb-3fd0-7207-9f39-d7678744524c@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Hi, On 8/2/22 14:52, Hans de Goede wrote: > Hi, > > On 8/2/22 13:25, Shyam Sundar S K wrote: >> PMF driver can send periodic heartbeat signals to OEM BIOS. When BIOS does >> not receive the signal after a period of time, it can infer that AMDPMF >> has hung or failed to load. >> >> In this situation, BIOS can fallback to legacy operations. OEM can modify >> the time interval of the signal or completely disable signals through >> ACPI Method. >> >> Reviewed-by: Hans de Goede >> Signed-off-by: Shyam Sundar S K >> --- >> drivers/platform/x86/amd/pmf/acpi.c | 37 +++++++++++++++++++++++++++-- >> drivers/platform/x86/amd/pmf/core.c | 1 + >> drivers/platform/x86/amd/pmf/pmf.h | 5 ++++ >> 3 files changed, 41 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/platform/x86/amd/pmf/acpi.c b/drivers/platform/x86/amd/pmf/acpi.c >> index 717ee81a5f73..c3f87265eeae 100644 >> --- a/drivers/platform/x86/amd/pmf/acpi.c >> +++ b/drivers/platform/x86/amd/pmf/acpi.c >> @@ -105,6 +105,25 @@ int apmf_get_static_slider_granular(struct amd_pmf_dev *pdev, >> data, sizeof(*data)); >> } >> >> +static void apmf_sbios_heartbeat_notify(struct work_struct *work) >> +{ >> + struct amd_pmf_dev *dev = container_of(work, struct amd_pmf_dev, heart_beat.work); >> + union acpi_object *info; >> + int err = 0; >> + >> + dev_dbg(dev->dev, "Sending heartbeat to SBIOS\n"); >> + info = apmf_if_call(dev, APMF_FUNC_SBIOS_HEARTBEAT, NULL); >> + if (!info) { >> + err = -EIO; > > I did not notice this before, but err gets set here and then never used. > > Maybe instead log an error when the call fails ? I just realized that apmf_if_call() already logs an error, so when we add the value of the fn argument (APMF_FUNC_SBIOS_HEARTBEAT) then there is no need for extra logging here. Note err getting set but never used will cause warnings with some compilers, please drop the err variable. > Also the work is not re-queued on an error here, I assume this is on > purpose ? Regards, Hans >> + goto out; >> + } >> + >> + schedule_delayed_work(&dev->heart_beat, msecs_to_jiffies(dev->hb_interval * 1000)); >> + >> +out: >> + kfree(info); >> +} >> + >> static int apmf_if_verify_interface(struct amd_pmf_dev *pdev) >> { >> struct apmf_verify_interface output; >> @@ -133,15 +152,23 @@ static int apmf_get_system_params(struct amd_pmf_dev *dev) >> if (err) >> return err; >> >> - dev_dbg(dev->dev, "system params mask:0x%x flags:0x%x cmd_code:0x%x\n", >> + dev_dbg(dev->dev, "system params mask:0x%x flags:0x%x cmd_code:0x%x heartbeat:%d\n", >> params.valid_mask, >> params.flags, >> - params.command_code); >> + params.command_code, >> + params.heartbeat_int); >> params.flags = params.flags & params.valid_mask; >> + dev->hb_interval = params.heartbeat_int; >> >> return 0; >> } >> >> +void apmf_acpi_deinit(struct amd_pmf_dev *pmf_dev) >> +{ >> + if (pmf_dev->hb_interval) >> + cancel_delayed_work_sync(&pmf_dev->heart_beat); >> +} >> + >> int apmf_acpi_init(struct amd_pmf_dev *pmf_dev) >> { >> int ret; >> @@ -158,6 +185,12 @@ int apmf_acpi_init(struct amd_pmf_dev *pmf_dev) >> goto out; >> } >> >> + if (pmf_dev->hb_interval) { >> + /* send heartbeats only if the interval is not zero */ >> + INIT_DELAYED_WORK(&pmf_dev->heart_beat, apmf_sbios_heartbeat_notify); >> + schedule_delayed_work(&pmf_dev->heart_beat, 0); >> + } >> + >> out: >> return ret; >> } >> diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c >> index 032d9dc5e09f..87a1f9b27d2c 100644 >> --- a/drivers/platform/x86/amd/pmf/core.c >> +++ b/drivers/platform/x86/amd/pmf/core.c >> @@ -279,6 +279,7 @@ static int amd_pmf_remove(struct platform_device *pdev) >> >> mutex_destroy(&dev->lock); >> amd_pmf_deinit_features(dev); >> + apmf_acpi_deinit(dev); >> amd_pmf_dbgfs_unregister(dev); >> kfree(dev->buf); >> return 0; >> diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h >> index e13542359403..5b85a7fe0f38 100644 >> --- a/drivers/platform/x86/amd/pmf/pmf.h >> +++ b/drivers/platform/x86/amd/pmf/pmf.h >> @@ -17,6 +17,7 @@ >> /* APMF Functions */ >> #define APMF_FUNC_VERIFY_INTERFACE 0 >> #define APMF_FUNC_GET_SYS_PARAMS 1 >> +#define APMF_FUNC_SBIOS_HEARTBEAT 4 >> #define APMF_FUNC_STATIC_SLIDER_GRANULAR 9 >> >> /* Message Definitions */ >> @@ -53,6 +54,7 @@ struct apmf_system_params { >> u32 valid_mask; >> u32 flags; >> u8 command_code; >> + u32 heartbeat_int; >> } __packed; >> >> enum amd_stt_skin_temp { >> @@ -91,6 +93,8 @@ struct amd_pmf_dev { >> enum platform_profile_option current_profile; >> struct platform_profile_handler pprof; >> struct dentry *dbgfs_dir; >> + int hb_interval; /* SBIOS heartbeat interval */ >> + struct delayed_work heart_beat; >> }; >> >> struct apmf_sps_prop_granular { >> @@ -116,6 +120,7 @@ struct amd_pmf_static_slider_granular { >> >> /* Core Layer */ >> int apmf_acpi_init(struct amd_pmf_dev *pmf_dev); >> +void apmf_acpi_deinit(struct amd_pmf_dev *pmf_dev); >> int is_apmf_func_supported(struct amd_pmf_dev *pdev, unsigned long index); >> int amd_pmf_send_cmd(struct amd_pmf_dev *dev, u8 message, bool get, u32 arg, u32 *data); >> int amd_pmf_get_power_source(void);