Commit eb1b5fc7 authored by Alexander Usyskin's avatar Alexander Usyskin Committed by Greg Kroah-Hartman
Browse files

mei: trace: print return value of pci_cfg_read 



Extend debug capabilities.
Add return value print in the trace_mei_pci_cfg_read().

Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Link: https://patch.msgid.link/20260201094358.1440593-5-alexander.usyskin@intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bf025a84

drivers/misc/mei/hw-me.c

+9 −6
Original line number Diff line number Diff line
@@ -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, &reg);

	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, &reg);

	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, &reg);

	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, &reg);

	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, &reg);

	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, &reg);

	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);

drivers/misc/mei/hw-txe.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/misc/mei/mei-trace.h

+6 −4
Original line number Diff line number Diff line
@@ -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_ */

drivers/misc/mei/pci-me.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}