From: Hans de Goede <hdegoede@redhat.com>
To: Henning Schild <henning.schild@siemens.com>,
linux-kernel@vger.kernel.org, linux-leds@vger.kernel.org,
platform-driver-x86@vger.kernel.org,
linux-watchdog@vger.kernel.org
Cc: Srikanth Krishnakar <skrishnakar@gmail.com>,
Jan Kiszka <jan.kiszka@siemens.com>,
Gerd Haeussler <gerd.haeussler.ext@siemens.com>,
Guenter Roeck <linux@roeck-us.net>,
Wim Van Sebroeck <wim@linux-watchdog.org>,
Mark Gross <mgross@linux.intel.com>, Pavel Machek <pavel@ucw.cz>,
Andy Shevchenko <andy.shevchenko@gmail.com>
Subject: Re: [PATCH] platform/x86: pmc_atom: use callback for all dmi quirk entries
Date: Mon, 15 Mar 2021 17:31:49 +0100 [thread overview]
Message-ID: <8577f3a8-c5e4-3752-1bc1-5937ee164217@redhat.com> (raw)
In-Reply-To: <20210315145855.17174-1-henning.schild@siemens.com>
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 <henning.schild@siemens.com>
> ---
> 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.
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);
> }
> }
>
>
next prev parent reply other threads:[~2021-03-15 16:32 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-15 9:57 [PATCH v2 0/4] add device drivers for Siemens Industrial PCs Henning Schild
2021-03-15 9:57 ` [PATCH v2 1/4] platform/x86: simatic-ipc: add main driver for Siemens devices Henning Schild
2021-03-15 10:31 ` Andy Shevchenko
2021-03-15 16:30 ` Henning Schild
2021-03-17 19:13 ` Henning Schild
2021-03-17 20:03 ` Hans de Goede
2021-03-18 11:30 ` Enrico Weigelt, metux IT consult
2021-03-18 11:45 ` Hans de Goede
2021-03-26 9:55 ` Henning Schild
2021-03-26 12:21 ` Hans de Goede
2021-03-15 9:57 ` [PATCH v2 2/4] leds: simatic-ipc-leds: add new driver for Siemens Industial PCs Henning Schild
2021-03-15 10:48 ` Andy Shevchenko
2021-03-15 11:19 ` Pavel Machek
2021-03-15 11:26 ` Andy Shevchenko
2021-03-15 12:40 ` Henning Schild
2021-03-18 11:38 ` Enrico Weigelt, metux IT consult
2021-03-27 9:46 ` Henning Schild
2021-04-01 16:20 ` Enrico Weigelt, metux IT consult
2021-03-27 9:56 ` Henning Schild
2021-03-18 10:27 ` Enrico Weigelt, metux IT consult
2021-03-18 12:40 ` Alexander Dahl
2021-03-23 17:45 ` Henning Schild
2021-03-26 16:33 ` Henning Schild
2021-03-18 10:25 ` Enrico Weigelt, metux IT consult
2021-03-27 11:16 ` Henning Schild
2021-03-27 11:41 ` Henning Schild
2021-03-15 9:57 ` [PATCH v2 3/4] watchdog: simatic-ipc-wdt: add new driver for Siemens Industrial PCs Henning Schild
2021-03-15 15:10 ` Guenter Roeck
2021-03-29 16:28 ` Henning Schild
2021-03-15 9:57 ` [PATCH v2 4/4] platform/x86: pmc_atom: improve critclk_systems matching for Siemens PCs Henning Schild
2021-03-15 10:14 ` Henning Schild
2021-03-15 10:19 ` Hans de Goede
2021-03-15 12:09 ` Henning Schild
2021-03-15 14:58 ` [PATCH] platform/x86: pmc_atom: use callback for all dmi quirk entries Henning Schild
2021-03-15 16:31 ` Hans de Goede [this message]
2021-03-15 17:00 ` Henning Schild
2021-03-15 18:01 ` Hans de Goede
2021-03-16 5:47 ` Henning Schild
2021-03-16 9:43 ` Hans de Goede
2021-03-15 13:25 ` [PATCH v2 4/4] platform/x86: pmc_atom: improve critclk_systems matching for Siemens PCs kernel test robot
2021-03-15 10:55 ` [PATCH v2 0/4] add device drivers for Siemens Industrial PCs Andy Shevchenko
2021-03-15 16:08 ` Henning Schild
2021-08-02 9:21 ` Henning Schild
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8577f3a8-c5e4-3752-1bc1-5937ee164217@redhat.com \
--to=hdegoede@redhat.com \
--cc=andy.shevchenko@gmail.com \
--cc=gerd.haeussler.ext@siemens.com \
--cc=henning.schild@siemens.com \
--cc=jan.kiszka@siemens.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mgross@linux.intel.com \
--cc=pavel@ucw.cz \
--cc=platform-driver-x86@vger.kernel.org \
--cc=skrishnakar@gmail.com \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).