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=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 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 40F45C433E6 for ; Mon, 15 Mar 2021 17:01:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1757E64DE5 for ; Mon, 15 Mar 2021 17:01:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232381AbhCORAu (ORCPT ); Mon, 15 Mar 2021 13:00:50 -0400 Received: from lizzard.sbs.de ([194.138.37.39]:43061 "EHLO lizzard.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235783AbhCORAl (ORCPT ); Mon, 15 Mar 2021 13:00:41 -0400 Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 12FH0Elx009549 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 15 Mar 2021 18:00:14 +0100 Received: from md1za8fc.ad001.siemens.net ([139.22.41.172]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 12FH0DGA001450; Mon, 15 Mar 2021 18:00:13 +0100 Date: Mon, 15 Mar 2021 18:00:11 +0100 From: Henning Schild To: Hans de Goede Cc: linux-kernel@vger.kernel.org, linux-leds@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-watchdog@vger.kernel.org, Srikanth Krishnakar , Jan Kiszka , Gerd Haeussler , Guenter Roeck , Wim Van Sebroeck , Mark Gross , Pavel Machek , Andy Shevchenko Subject: Re: [PATCH] platform/x86: pmc_atom: use callback for all dmi quirk entries Message-ID: <20210315180011.6a3f60b0@md1za8fc.ad001.siemens.net> In-Reply-To: <8577f3a8-c5e4-3752-1bc1-5937ee164217@redhat.com> References: <20210315145855.17174-1-henning.schild@siemens.com> <8577f3a8-c5e4-3752-1bc1-5937ee164217@redhat.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-leds@vger.kernel.org Am Mon, 15 Mar 2021 17:31:49 +0100 schrieb Hans de Goede : > Hi, > > On 3/15/21 3:58 PM, Henning Schild wrote: > > Introduce a global variable to remember the matching entry for later > > printing. Also having a callback allows to stop matching after the > > first hit. > > > > Signed-off-by: Henning Schild > > --- > > drivers/platform/x86/pmc_atom.c | 26 ++++++++++++++++++++------ > > 1 file changed, 20 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/platform/x86/pmc_atom.c > > b/drivers/platform/x86/pmc_atom.c index 38542d547f29..d0f74856cd8b > > 100644 --- a/drivers/platform/x86/pmc_atom.c > > +++ b/drivers/platform/x86/pmc_atom.c > > @@ -364,8 +364,16 @@ static void pmc_dbgfs_register(struct pmc_dev > > *pmc) #endif /* CONFIG_DEBUG_FS */ > > > > static bool pmc_clk_is_critical = true; > > +static const struct dmi_system_id *dmi_critical; > > > > -static int siemens_clk_is_critical(const struct dmi_system_id *d) > > +static int dmi_callback(const struct dmi_system_id *d) > > +{ > > + dmi_critical = d; > > Don't introduce a global variable for this please. Instead just > directly print the ident of the matching dmi_system_id here. Sorry, missed that part. Result looks nice and clean, thanks. I think i will squash it into 4/4 in v3 and not follow up here for now. Henning > Regards, > > Hans > > > > + > > + return 1; > > +} > > + > > +static int dmi_callback_siemens(const struct dmi_system_id *d) > > { > > u32 st_id; > > > > @@ -373,7 +381,7 @@ static int siemens_clk_is_critical(const struct > > dmi_system_id *d) goto out; > > > > if (st_id == SIMATIC_IPC_IPC227E || st_id == > > SIMATIC_IPC_IPC277E) > > - return 1; > > + return dmi_callback(d); > > > > out: > > pmc_clk_is_critical = false; > > @@ -388,6 +396,7 @@ static const struct dmi_system_id > > critclk_systems[] = { { > > /* pmc_plt_clk0 is used for an external HSIC USB > > HUB */ .ident = "MPL CEC1x", > > + .callback = dmi_callback, > > .matches = { > > DMI_MATCH(DMI_SYS_VENDOR, "MPL AG"), > > DMI_MATCH(DMI_PRODUCT_NAME, "CEC10 > > Family"), @@ -396,6 +405,7 @@ static const struct dmi_system_id > > critclk_systems[] = { { > > /* pmc_plt_clk0 - 3 are used for the 4 ethernet > > controllers */ .ident = "Lex 3I380D", > > + .callback = dmi_callback, > > .matches = { > > DMI_MATCH(DMI_SYS_VENDOR, "Lex BayTrail"), > > DMI_MATCH(DMI_PRODUCT_NAME, "3I380D"), > > @@ -404,6 +414,7 @@ static const struct dmi_system_id > > critclk_systems[] = { { > > /* pmc_plt_clk* - are used for ethernet > > controllers */ .ident = "Lex 2I385SW", > > + .callback = dmi_callback, > > .matches = { > > DMI_MATCH(DMI_SYS_VENDOR, "Lex BayTrail"), > > DMI_MATCH(DMI_PRODUCT_NAME, "2I385SW"), > > @@ -412,6 +423,7 @@ static const struct dmi_system_id > > critclk_systems[] = { { > > /* pmc_plt_clk* - are used for ethernet > > controllers */ .ident = "Beckhoff CB3163", > > + .callback = dmi_callback, > > .matches = { > > DMI_MATCH(DMI_SYS_VENDOR, "Beckhoff > > Automation"), DMI_MATCH(DMI_BOARD_NAME, "CB3163"), > > @@ -420,6 +432,7 @@ static const struct dmi_system_id > > critclk_systems[] = { { > > /* pmc_plt_clk* - are used for ethernet > > controllers */ .ident = "Beckhoff CB4063", > > + .callback = dmi_callback, > > .matches = { > > DMI_MATCH(DMI_SYS_VENDOR, "Beckhoff > > Automation"), DMI_MATCH(DMI_BOARD_NAME, "CB4063"), > > @@ -428,6 +441,7 @@ static const struct dmi_system_id > > critclk_systems[] = { { > > /* pmc_plt_clk* - are used for ethernet > > controllers */ .ident = "Beckhoff CB6263", > > + .callback = dmi_callback, > > .matches = { > > DMI_MATCH(DMI_SYS_VENDOR, "Beckhoff > > Automation"), DMI_MATCH(DMI_BOARD_NAME, "CB6263"), > > @@ -436,13 +450,14 @@ static const struct dmi_system_id > > critclk_systems[] = { { > > /* pmc_plt_clk* - are used for ethernet > > controllers */ .ident = "Beckhoff CB6363", > > + .callback = dmi_callback, > > .matches = { > > DMI_MATCH(DMI_SYS_VENDOR, "Beckhoff > > Automation"), DMI_MATCH(DMI_BOARD_NAME, "CB6363"), > > }, > > }, > > { > > - .callback = siemens_clk_is_critical, > > + .callback = dmi_callback_siemens, > > .ident = "SIEMENS AG", > > .matches = { > > DMI_MATCH(DMI_SYS_VENDOR, "SIEMENS AG"), > > @@ -457,7 +472,6 @@ static int pmc_setup_clks(struct pci_dev *pdev, > > void __iomem *pmc_regmap, { > > struct platform_device *clkdev; > > struct pmc_clk_data *clk_data; > > - const struct dmi_system_id *d; > > > > clk_data = kzalloc(sizeof(*clk_data), GFP_KERNEL); > > if (!clk_data) > > @@ -468,8 +482,8 @@ static int pmc_setup_clks(struct pci_dev *pdev, > > void __iomem *pmc_regmap, if (dmi_check_system(critclk_systems)) { > > clk_data->critical = pmc_clk_is_critical; > > if (clk_data->critical) { > > - d = dmi_first_match(critclk_systems); > > - pr_info("%s critclks quirk enabled\n", > > d->ident); > > + pr_info("%s critclks quirk enabled\n", > > + dmi_critical->ident); > > } > > } > > > > >