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 F3E0BC00144 for ; Mon, 1 Aug 2022 11:24:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229905AbiHALYt (ORCPT ); Mon, 1 Aug 2022 07:24:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229815AbiHALYs (ORCPT ); Mon, 1 Aug 2022 07:24:48 -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 5CD552D1F9 for ; Mon, 1 Aug 2022 04:24:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659353086; 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=aWRvTAdEbNmmh+m1dA2HtXNxH046nG9UmMVru7L14gA=; b=PJCoW7H7m+fCEzQC2BoS+H7+9k+6ftfHue8l3IJLrLF7PHUizuuOn+PTaR5/wuMK7hnZ9D BntMu+GTyxmxsX/DwmKxi/Bhhv1qhAW87lKW5+vXVBnFF5374saTv6n+9XA+0Y1yyL/Rqg duu+fOsB13bxQWh1waY8OwxnhEHVxZM= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-118-wD3ZgAH_Nsasa6Pd_nFkpQ-1; Mon, 01 Aug 2022 07:24:43 -0400 X-MC-Unique: wD3ZgAH_Nsasa6Pd_nFkpQ-1 Received: by mail-ej1-f71.google.com with SMTP id qb31-20020a1709077e9f00b007304bcf4181so721605ejc.19 for ; Mon, 01 Aug 2022 04:24:43 -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:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=aWRvTAdEbNmmh+m1dA2HtXNxH046nG9UmMVru7L14gA=; b=wZS/TAZde7JeXPdPBuP9gQQFOKBaFqRrKSEL5xURftVNRTHk/BobGvXz7B7lHvX3W5 dJ5l/tgQxOmH/u7PTgDzP6PK+0GEALAgGTGiENz3LbtH3rvcgGNEbyxCle6aTJCzE/o5 RjnyDVdVqVMtdqWXdObN5JCWOZvgghsGJ8EiNHmrtztMFGqwHJ+znmhbCmSDp7STNMKd gZUrQCgez9JhgbvJQh1/54aVBAIoL1vWy8G9CfAxTz7JnH8mvyy/VC024aO/kdG3Gqyr oX8RBr0ZhE65tLTTpHEULYnhV/NNFGeZOmGUQFYMF4MgqW2CsMIP437RdFOcy1vZt+Ns KIxw== X-Gm-Message-State: AJIora9IOwjhLuw2u7qLEfyllfMbLylJaqloopGuaB/elFSnNTLME1ap QRBfqayMbryqYoueZsUbBWmnlY3wtFytvlgDo4NflRmIFe/9pRd+4Vt8EvbSOm9GFbEcBcpLo76 AjGgTO+UFxC8cjjxcbMX32evLiaH6F8TxpA== X-Received: by 2002:a05:6402:90d:b0:43b:9ee5:f7eb with SMTP id g13-20020a056402090d00b0043b9ee5f7ebmr15107659edz.71.1659353082063; Mon, 01 Aug 2022 04:24:42 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vK1i2nIZr9MPXI6GyBLx0iO+KKuKffhJszorLe261oUThwXxTZaMJ0FNnix8Khx8thQ0pVdA== X-Received: by 2002:a05:6402:90d:b0:43b:9ee5:f7eb with SMTP id g13-20020a056402090d00b0043b9ee5f7ebmr15107644edz.71.1659353081871; Mon, 01 Aug 2022 04:24:41 -0700 (PDT) Received: from [10.40.98.142] ([78.108.130.194]) by smtp.gmail.com with ESMTPSA id d17-20020a170906175100b00718e4e64b7bsm5093905eje.79.2022.08.01.04.24.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 01 Aug 2022 04:24:41 -0700 (PDT) Message-ID: Date: Mon, 1 Aug 2022 13:24:40 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Subject: Re: [PATCH v2 RESEND 02/11] platform/x86/amd/pmf: Add support for PMF APCI layer Content-Language: en-US To: Shyam Sundar S K , markgross@kernel.org Cc: platform-driver-x86@vger.kernel.org, Patil.Reddy@amd.com References: <20220728182028.2082096-1-Shyam-sundar.S-k@amd.com> <20220728182028.2082096-3-Shyam-sundar.S-k@amd.com> From: Hans de Goede In-Reply-To: <20220728182028.2082096-3-Shyam-sundar.S-k@amd.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 7/28/22 20:20, Shyam Sundar S K wrote: > PMF driver implements the ACPI methods as defined by AMD for PMF Support. > The ACPI layer acts as a glue that helps in providing the infrastructure > for OEMs customization. > > OEMs can refer to PMF support documentation to decide on the list of > functions to be supported on their specific platform model. > > AMD mandates that PMF ACPI fn0 and fn1 to be implemented which > provides the set of functions, params and the notifications that > would be sent to PMF driver so that PMF driver can adapt and > react. > > Signed-off-by: Shyam Sundar S K > --- > drivers/platform/x86/amd/pmf/Makefile | 2 +- > drivers/platform/x86/amd/pmf/acpi.c | 182 ++++++++++++++++++++++++++ > drivers/platform/x86/amd/pmf/core.c | 1 + > drivers/platform/x86/amd/pmf/pmf.h | 32 +++++ > 4 files changed, 216 insertions(+), 1 deletion(-) > create mode 100644 drivers/platform/x86/amd/pmf/acpi.c > > diff --git a/drivers/platform/x86/amd/pmf/Makefile b/drivers/platform/x86/amd/pmf/Makefile > index 459005f659e5..2617eba773ce 100644 > --- a/drivers/platform/x86/amd/pmf/Makefile > +++ b/drivers/platform/x86/amd/pmf/Makefile > @@ -5,4 +5,4 @@ > # > > obj-$(CONFIG_AMD_PMF) += amd-pmf.o > -amd-pmf-objs := core.o > +amd-pmf-objs := core.o acpi.o > diff --git a/drivers/platform/x86/amd/pmf/acpi.c b/drivers/platform/x86/amd/pmf/acpi.c > new file mode 100644 > index 000000000000..bd796d7e1d96 > --- /dev/null > +++ b/drivers/platform/x86/amd/pmf/acpi.c > @@ -0,0 +1,182 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * AMD Platform Management Framework Driver > + * > + * Copyright (c) 2022, Advanced Micro Devices, Inc. > + * All Rights Reserved. > + * > + * Author: Shyam Sundar S K > + */ > + > +#include > +#include "pmf.h" > + > +#define APMF_METHOD "\\_SB_.PMF_.APMF" > + > +static unsigned long supported_func; > + > +static void apmf_if_parse_functions(struct apmf_if_functions *func, u32 mask); > + > +static union acpi_object *apmf_if_call(struct apmf_if *apmf_if, int func, struct acpi_buffer *param) > +{ > + struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; > + struct acpi_object_list apmf_if_arg_list; > + union acpi_object apmf_if_args[2]; > + acpi_status status; > + > + apmf_if_arg_list.count = 2; > + apmf_if_arg_list.pointer = &apmf_if_args[0]; > + > + apmf_if_args[0].type = ACPI_TYPE_INTEGER; > + apmf_if_args[0].integer.value = func; > + > + if (param) { > + apmf_if_args[1].type = ACPI_TYPE_BUFFER; > + apmf_if_args[1].buffer.length = param->length; > + apmf_if_args[1].buffer.pointer = param->pointer; > + } else { > + apmf_if_args[1].type = ACPI_TYPE_INTEGER; > + apmf_if_args[1].integer.value = 0; > + } > + > + status = acpi_evaluate_object(apmf_if->handle, NULL, &apmf_if_arg_list, &buffer); > + if (ACPI_FAILURE(status)) { > + pr_err("PMF: APMF method call failed\n"); > + if (status != AE_NOT_FOUND) > + kfree(buffer.pointer); > + > + return NULL; > + } > + > + return buffer.pointer; > +} > + The below helper is much better then the open coding in the v1 series, thank you. > +static int apmf_if_call_store_buffer(struct apmf_if *apmf_if, int func, void *dest, size_t out_sz) > +{ > + union acpi_object *info; > + size_t size; > + int err = 0; > + > + info = apmf_if_call(apmf_if, func, NULL); > + if (!info) > + return -EIO; > + > + if (info->type != ACPI_TYPE_BUFFER) { > + pr_err("object is not a buffer\n"); Since you use pr_err, you should put the following line: #define pr_fmt(fmt) "AMD-PMF: " fmt *above* the first #include in this .c file, so that the errors get pre-fixed with "AMD-PMF: " when printed. > + err = -EINVAL; > + goto out; > + } > + > + if (info->buffer.length < 2) { > + pr_err("buffer too small\n"); > + err = -EINVAL; > + goto out; > + } > + > + size = *(u16 *)info->buffer.pointer; > + if (info->buffer.length < size) { > + pr_err("buffer smaller then headersize %u < %zu\n", > + info->buffer.length, size); > + err = -EINVAL; > + goto out; > + } > + > + if (size < out_sz) { > + pr_err("buffer too small %zu\n", size); > + err = -EINVAL; > + goto out; > + } > + > + size = out_sz; Please drop this line > + memcpy(dest, info->buffer.pointer, size); and just use out_sz directly here instead of size. > + > +out: > + kfree(info); > + return err; > +} > + > +static void apmf_if_parse_functions(struct apmf_if_functions *func, u32 mask) > +{ > + func->system_params = mask & APMF_FUNC_GET_SYS_PARAMS; > +} > + > +int is_apmf_func_supported(unsigned long index) > +{ > + /* If bit-n is set, that indicates function n+1 is supported */ > + return ((supported_func & (1 << (index - 1))) != 0); > +} > + > +static int apmf_if_verify_interface(struct amd_pmf_dev *pdev, struct apmf_if *apmf_if) > +{ > + struct apmf_verify_interface output; > + int err; > + > + err = apmf_if_call_store_buffer(apmf_if, APMF_FUNC_VERIFY_INTERFACE, > + &output, sizeof(output)); > + if (err) > + return err; > + > + apmf_if_parse_functions(&apmf_if->func, output.supported_functions); > + supported_func = output.supported_functions; > + dev_dbg(pdev->dev, "supported functions:0x%x notifications:0x%x\n", > + output.supported_functions, output.notification_mask); > + > + return 0; > +} > + > +static int apmf_get_system_params(struct apmf_if *apmf_if) > +{ > + struct apmf_system_params params; > + int err; > + > + if (apmf_if->func.system_params) { > + err = apmf_if_call_store_buffer(apmf_if, APMF_FUNC_GET_SYS_PARAMS, > + ¶ms, sizeof(params)); > + if (err) > + return err; > + } > + > + pr_debug("PMF: system params mask:0x%x flags:0x%x cmd_code:0x%x\n", > + params.valid_mask, > + params.flags, > + params.command_code); > + params.flags = params.flags & params.valid_mask; > + > + return 0; > +} > + > +int apmf_acpi_init(struct amd_pmf_dev *pmf_dev) > +{ > + acpi_handle apmf_if_handle; > + struct apmf_if *apmf_if; > + acpi_status status; > + int ret; > + > + status = acpi_get_handle(NULL, (acpi_string) APMF_METHOD, &apmf_if_handle); > + if (ACPI_FAILURE(status)) > + return -ENODEV; > + > + apmf_if = kzalloc(sizeof(*apmf_if), GFP_KERNEL); > + if (!apmf_if) > + goto out; > + > + apmf_if->handle = apmf_if_handle; > + > + ret = apmf_if_verify_interface(pmf_dev, apmf_if); > + if (ret) { > + dev_err(pmf_dev->dev, "APMF verify interface failed :%d\n", ret); > + kfree(apmf_if); > + goto out; > + } > + pmf_dev->apmf_if = apmf_if; > + > + ret = apmf_get_system_params(apmf_if); > + if (ret) { > + dev_err(pmf_dev->dev, "APMF apmf_get_system_params failed :%d\n", ret); > + kfree(apmf_if); > + goto out; If you hit this error path you now have pmf_dev->ampf_of pointing to free-ed memory. Please move the: pmf_dev->apmf_if = apmf_if; statement to below this "if (ret) {}" block. > + } > + > +out: > + return ret; > +} > diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c > index aef97965c181..c5002b7bb904 100644 > --- a/drivers/platform/x86/amd/pmf/core.c > +++ b/drivers/platform/x86/amd/pmf/core.c > @@ -204,6 +204,7 @@ static int amd_pmf_probe(struct platform_device *pdev) > if (!dev->regbase) > return -ENOMEM; > > + apmf_acpi_init(dev); > platform_set_drvdata(pdev, dev); > > mutex_init(&dev->lock); > diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h > index 1c2e942e5096..08c6bc0e2b42 100644 > --- a/drivers/platform/x86/amd/pmf/pmf.h > +++ b/drivers/platform/x86/amd/pmf/pmf.h > @@ -11,6 +11,12 @@ > #ifndef PMF_H > #define PMF_H > > +#include > + > +/* APMF Functions */ > +#define APMF_FUNC_VERIFY_INTERFACE 0 > +#define APMF_FUNC_GET_SYS_PARAMS 1 > + > /* Message Definitions */ > #define SET_SPL 0x03 /* SPL: Sustained Power Limit */ > #define SET_SPPT 0x05 /* SPPT: Slow Package Power Tracking */ > @@ -30,6 +36,30 @@ > #define GET_STT_LIMIT_APU 0x20 > #define GET_STT_LIMIT_HS2 0x21 > > +/* AMD PMF BIOS interfaces */ > +struct apmf_if_functions { > + bool system_params; > +}; > + > +struct apmf_if { > + acpi_handle handle; > + struct apmf_if_functions func; > +}; > + > +struct apmf_verify_interface { > + u16 size; > + u16 version; > + u32 notification_mask; > + u32 supported_functions; > +} __packed; > + > +struct apmf_system_params { > + u16 size; > + u32 valid_mask; > + u32 flags; > + u8 command_code; > +} __packed; > + > struct amd_pmf_dev { > void __iomem *regbase; > void __iomem *smu_virt_addr; > @@ -37,10 +67,12 @@ struct amd_pmf_dev { > u32 base_addr; > u32 cpu_id; > struct device *dev; > + struct apmf_if *apmf_if; > struct mutex lock; /* protects the PMF interface */ > }; > > /* Core Layer */ > +int apmf_acpi_init(struct amd_pmf_dev *pmf_dev); > int amd_pmf_send_cmd(struct amd_pmf_dev *dev, u8 message, bool get, u32 arg, u32 *data); > > #endif /* PMF_H */ Except for the few small remarks this looks good to me now, so with the few remarks fixed, yoy can add my: Reviewed-by: Hans de Goede To the next version. Regards, Hans