From: Alexander Usyskin <alexander.usyskin@intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Menachem Adin <menachem.adin@intel.com>,
Alexander Usyskin <alexander.usyskin@intel.com>,
linux-kernel@vger.kernel.org,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [char-misc-next 4/7] mei: trace: print return value of pci_cfg_read
Date: Sun, 1 Feb 2026 11:43:55 +0200 [thread overview]
Message-ID: <20260201094358.1440593-5-alexander.usyskin@intel.com> (raw)
In-Reply-To: <20260201094358.1440593-1-alexander.usyskin@intel.com>
Extend debug capabilities.
Add return value print in the trace_mei_pci_cfg_read().
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
---
drivers/misc/mei/hw-me.c | 15 +++++++++------
drivers/misc/mei/hw-txe.c | 2 +-
drivers/misc/mei/mei-trace.h | 10 ++++++----
drivers/misc/mei/pci-me.c | 2 +-
4 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
index c0d4a02d9cae..72a7cfb2989f 100644
--- a/drivers/misc/mei/hw-me.c
+++ b/drivers/misc/mei/hw-me.c
@@ -1505,10 +1505,11 @@ static bool mei_me_fw_type_nm(const struct pci_dev *pdev)
{
u32 reg;
unsigned int devfn;
+ int ret;
devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0);
- pci_bus_read_config_dword(pdev->bus, devfn, PCI_CFG_HFS_2, ®);
- trace_mei_pci_cfg_read(&pdev->dev, "PCI_CFG_HFS_2", PCI_CFG_HFS_2, reg);
+ ret = pci_bus_read_config_dword(pdev->bus, devfn, PCI_CFG_HFS_2, ®);
+ trace_mei_pci_cfg_read(&pdev->dev, "PCI_CFG_HFS_2", PCI_CFG_HFS_2, reg, ret);
/* make sure that bit 9 (NM) is up and bit 10 (DM) is down */
return (reg & 0x600) == 0x200;
}
@@ -1531,10 +1532,11 @@ static bool mei_me_fw_type_sps_4(const struct pci_dev *pdev)
{
u32 reg;
unsigned int devfn;
+ int ret;
devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0);
- pci_bus_read_config_dword(pdev->bus, devfn, PCI_CFG_HFS_1, ®);
- trace_mei_pci_cfg_read(&pdev->dev, "PCI_CFG_HFS_1", PCI_CFG_HFS_1, reg);
+ ret = pci_bus_read_config_dword(pdev->bus, devfn, PCI_CFG_HFS_1, ®);
+ trace_mei_pci_cfg_read(&pdev->dev, "PCI_CFG_HFS_1", PCI_CFG_HFS_1, reg, ret);
return (reg & PCI_CFG_HFS_1_OPMODE_MSK) == PCI_CFG_HFS_1_OPMODE_SPS;
}
@@ -1556,10 +1558,11 @@ static bool mei_me_fw_type_sps_ign(const struct pci_dev *pdev)
u32 reg;
u32 fw_type;
unsigned int devfn;
+ int ret;
devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0);
- pci_bus_read_config_dword(pdev->bus, devfn, PCI_CFG_HFS_3, ®);
- trace_mei_pci_cfg_read(&pdev->dev, "PCI_CFG_HFS_3", PCI_CFG_HFS_3, reg);
+ ret = pci_bus_read_config_dword(pdev->bus, devfn, PCI_CFG_HFS_3, ®);
+ trace_mei_pci_cfg_read(&pdev->dev, "PCI_CFG_HFS_3", PCI_CFG_HFS_3, reg, ret);
fw_type = (reg & PCI_CFG_HFS_3_FW_SKU_MSK);
dev_dbg(&pdev->dev, "fw type is %d\n", fw_type);
diff --git a/drivers/misc/mei/hw-txe.c b/drivers/misc/mei/hw-txe.c
index e4688c391027..008cb1ede56c 100644
--- a/drivers/misc/mei/hw-txe.c
+++ b/drivers/misc/mei/hw-txe.c
@@ -651,7 +651,7 @@ static int mei_txe_fw_status(struct mei_device *dev,
&fw_status->status[i]);
trace_mei_pci_cfg_read(&dev->dev, "PCI_CFG_HSF_X",
fw_src->status[i],
- fw_status->status[i]);
+ fw_status->status[i], ret);
if (ret)
return ret;
}
diff --git a/drivers/misc/mei/mei-trace.h b/drivers/misc/mei/mei-trace.h
index 24fa321d88bd..fa5224e5353a 100644
--- a/drivers/misc/mei/mei-trace.h
+++ b/drivers/misc/mei/mei-trace.h
@@ -55,22 +55,24 @@ TRACE_EVENT(mei_reg_write,
);
TRACE_EVENT(mei_pci_cfg_read,
- TP_PROTO(const struct device *dev, const char *reg, u32 offs, u32 val),
- TP_ARGS(dev, reg, offs, val),
+ TP_PROTO(const struct device *dev, const char *reg, u32 offs, u32 val, int ret),
+ TP_ARGS(dev, reg, offs, val, ret),
TP_STRUCT__entry(
__string(dev, dev_name(dev))
__string(reg, reg)
__field(u32, offs)
__field(u32, val)
+ __field(int, ret)
),
TP_fast_assign(
__assign_str(dev);
__assign_str(reg);
__entry->offs = offs;
__entry->val = val;
+ __entry->ret = ret;
),
- TP_printk("[%s] pci cfg read %s:[%#x] = %#x",
- __get_str(dev), __get_str(reg), __entry->offs, __entry->val)
+ TP_printk("[%s] pci cfg read %s:[%#x] = %#x, ret = %d",
+ __get_str(dev), __get_str(reg), __entry->offs, __entry->val, __entry->ret)
);
#endif /* _MEI_TRACE_H_ */
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index b4c9526857bb..a75773cc8fb7 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -152,7 +152,7 @@ static int mei_me_read_fws(const struct mei_device *dev, int where, const char *
int ret;
ret = pci_read_config_dword(pdev, where, val);
- trace_mei_pci_cfg_read(&dev->dev, name, where, *val);
+ trace_mei_pci_cfg_read(&dev->dev, name, where, *val, ret);
return ret;
}
--
2.43.0
next prev parent reply other threads:[~2026-02-01 10:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-01 9:43 [char-misc-next 0/7] mei: csc: support controller with separate PCI device Alexander Usyskin
2026-02-01 9:43 ` [char-misc-next 1/7] mei: me: use PCI_DEVICE_DATA macro Alexander Usyskin
2026-02-01 9:43 ` [char-misc-next 2/7] mei: fix idle print specifiers Alexander Usyskin
2026-02-01 9:43 ` [char-misc-next 3/7] mei: me: move trace into firmware status read Alexander Usyskin
2026-02-01 9:43 ` Alexander Usyskin [this message]
2026-02-01 9:43 ` [char-misc-next 5/7] mei: convert PCI error to common errno Alexander Usyskin
2026-02-01 9:43 ` [char-misc-next 6/7] mei: csc: support controller with separate PCI device Alexander Usyskin
2026-02-01 9:43 ` [char-misc-next 7/7] mei: csc: wake device while reading firmware status Alexander Usyskin
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=20260201094358.1440593-5-alexander.usyskin@intel.com \
--to=alexander.usyskin@intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=menachem.adin@intel.com \
/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
all inboxes | Powered by JetHome®