mei: me: allow mei to be embedded within another pci device.
Subsystems (2)
cover mei: me: allow mei to be embedded within another pci device.
Allow mei to be embedded within another pci device, by detaching some of the core functions from 'struct pci_dev'
Alexander Usyskin (1):
mei: me: store irq number in the hw struct.
Tomas Winkler (2):
mei: me: mei_me_dev_init() use struct device instead of struct
pci_dev.
mei: abstract fw status register read.
drivers/misc/mei/hw-me.c | 38 +++++++++++++++++++++++--------------- drivers/misc/mei/hw-me.h | 8 ++++++-- drivers/misc/mei/hw-txe.c | 10 +++++++--- drivers/misc/mei/init.c | 6 ++++-- drivers/misc/mei/mei_dev.h | 8 ++++---- drivers/misc/mei/pci-me.c | 11 ++++++++++- 6 files changed, 54 insertions(+), 27 deletions(-)
Signature · 1 line
2.21.0
PATCH 1/3 mei: me: mei_me_dev_init() use struct device instead of struct pci_dev.
It's enough to bind mei_device with associated 'struct device' instead of actual 'struct pci_dev'. This is to allow working with mei devices embedded within another pci device, usually via MFD framework, where mei device is represented as a platform device.
Bump copyright year to 2019 on effected files.
--- drivers/misc/mei/hw-me.c | 10 +++++----- drivers/misc/mei/hw-me.h | 4 ++-- drivers/misc/mei/pci-me.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)
drivers/misc/mei/hw-me.c +5 -5
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) 2003-2018, Intel Corporation. All rights reserved. +* Copyright (c) 2003-2019, Intel Corporation. All rights reserved. * Intel Management Engine Interface (Intel MEI) Linux driver */
@@ -1461,19 +1461,19 @@ const struct mei_cfg *mei_me_get_cfg(kernel_ulong_t idx)/** * mei_me_dev_init - allocates and initializes the mei device structure * -* @pdev: The pci device structure +* @parent: device associated with physical device (pci/platform) * @cfg: per device generation config * * Return: The mei_device pointer on success, NULL on failure. */ -struct mei_device *mei_me_dev_init (struct pci_dev *pdev, +struct mei_device *mei_me_dev_init (struct device *parent,const struct mei_cfg *cfg) {struct mei_device *dev;struct mei_me_hw *hw;int i; - dev =devm_kzalloc (&pdev->dev,sizeof (struct mei_device ) + + dev =devm_kzalloc (parent,sizeof (struct mei_device ) +sizeof (struct mei_me_hw ),GFP_KERNEL );if (!dev)return NULL ;
@@ -1483,7 +1483,7 @@ struct mei_device *mei_me_dev_init(struct pci_dev *pdev,for (i =0 ; i <DMA_DSCR_NUM ; i++) dev->dr_dscr[i].size = cfg->dma_size[i]; -mei_device_init (dev, &pdev->dev, &mei_me_hw_ops); +mei_device_init (dev, parent, &mei_me_hw_ops); hw->cfg = cfg; dev->fw_f_fw_ver_supported = cfg->fw_ver_supported;
drivers/misc/mei/hw-me.h +2 -2
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 */ /* -* Copyright (c) 2012-2018, Intel Corporation. All rights reserved. +* Copyright (c) 2012-2019, Intel Corporation. All rights reserved. * Intel Management Engine Interface (Intel MEI) Linux driver */
@@ -91,7 +91,7 @@ enum mei_cfg_idx {const struct mei_cfg *mei_me_get_cfg (kernel_ulong_t idx); -struct mei_device *mei_me_dev_init (struct pci_dev *pdev, +struct mei_device *mei_me_dev_init (struct device *parent,const struct mei_cfg *cfg);int mei_me_pg_enter_sync (struct mei_device *dev);
drivers/misc/mei/pci-me.c +1 -1
@@ -192,7 +192,7 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent) }/* allocates and initializes the mei dev structure */ - dev =mei_me_dev_init (pdev, cfg); + dev =mei_me_dev_init (&pdev->dev, cfg);if (!dev) { err = -ENOMEM ; goto end;
Signature · 1 line
2.21.0
PATCH 2/3 mei: me: store irq number in the hw struct.
In reply to Tomas WinklerFrom: Alexander Usyskin <[email protected]>
Store irq number in hw struct to by used by synchronize_irq(). This is to allow working with mei devices
embedded within another pci devices, via MFD framework, where mei device is represented as a platform device.
Bump the copyright year to 2019 on hw-me.c and hw-me.h
--- drivers/misc/mei/hw-me.c | 4 ++-- drivers/misc/mei/hw-me.h | 2 ++ drivers/misc/mei/pci-me.c | 1 + 3 files changed, 5 insertions(+), 2 deletions(-)
drivers/misc/mei/hw-me.c +2 -2
@@ -323,9 +323,9 @@ static void mei_me_intr_disable(struct mei_device *dev)*/ static void mei_me_synchronize_irq (struct mei_device *dev) { -struct pci_dev *pdev =to_pci_dev (dev->dev); +struct mei_me_hw *hw =to_me_hw (dev); -synchronize_irq (pdev->irq); +synchronize_irq (hw->irq); }/**
drivers/misc/mei/hw-me.h +2 -0
@@ -42,6 +42,7 @@ struct mei_cfg {* * @cfg: per device generation config and ops * @mem_addr: io memory address +* @irq: irq number * @pg_state: power gating state * @d0i3_supported: di03 support * @hbuf_depth: depth of hardware host/write buffer in slots
@@ -49,6 +50,7 @@ struct mei_cfg {struct mei_me_hw {const struct mei_cfg *cfg;void __iomem *mem_addr; +int irq;enum mei_pg_state pg_state;bool d0i3_supported;u8 hbuf_depth;
drivers/misc/mei/pci-me.c +1 -0
@@ -199,6 +199,7 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent) } hw =to_me_hw (dev); hw->mem_addr =pcim_iomap_table (pdev)[0 ]; + hw->irq = pdev->irq;pci_enable_msi (pdev);
Signature · 1 line
2.21.0
PATCH 3/3 mei: abstract fw status register read.
In reply to Tomas WinklerThis is to allow working with mei devices embedded within another pci device, where mei device is represented as a platform child device and fw status registers are not necessarily resident in the device pci config space.
Bump the copyright year to 2019 on the modified files.
--- drivers/misc/mei/hw-me.c | 24 ++++++++++++++++-------- drivers/misc/mei/hw-me.h | 2 ++ drivers/misc/mei/hw-txe.c | 10 +++++++--- drivers/misc/mei/init.c | 6 ++++-- drivers/misc/mei/mei_dev.h | 8 ++++---- drivers/misc/mei/pci-me.c | 8 ++++++++ 6 files changed, 41 insertions(+), 17 deletions(-)
drivers/misc/mei/hw-me.c +16 -8
@@ -183,20 +183,19 @@ static inline void mei_me_d0i3c_write(struct mei_device *dev, u32 reg)static int mei_me_fw_status (struct mei_device *dev,struct mei_fw_status *fw_status) { -struct pci_dev *pdev =to_pci_dev (dev->dev);struct mei_me_hw *hw =to_me_hw (dev);const struct mei_fw_status *fw_src = &hw->cfg->fw_status;int ret;int i; -if (!fw_status) +if (!fw_status || !hw->read_fws)return -EINVAL ; fw_status->count = fw_src->count;for (i =0 ; i < fw_src->count && i <MEI_FW_STATUS_MAX ; i++) { - ret =pci_read_config_dword (pdev, fw_src->status[i], - &fw_status->status[i]); -trace_mei_pci_cfg_read (dev->dev,"PCI_CFG_HSF_X" , + ret = hw->read_fws (dev, fw_src->status[i], + &fw_status->status[i]); +trace_mei_pci_cfg_read (dev->dev,"PCI_CFG_HFS_X" , fw_src->status[i], fw_status->status[i]);if (ret)
@@ -210,19 +209,26 @@ static int mei_me_fw_status(struct mei_device *dev,* mei_me_hw_config - configure hw dependent settings * * @dev: mei device +* +* Return: +* * -EINVAL when read_fws is not set +* * 0 on success +* */ -static void mei_me_hw_config (struct mei_device *dev) +static int mei_me_hw_config (struct mei_device *dev) { -struct pci_dev *pdev =to_pci_dev (dev->dev);struct mei_me_hw *hw =to_me_hw (dev);u32 hcsr, reg; +if (WARN_ON (!hw->read_fws)) +return -EINVAL ; +/* Doesn't change in runtime */ hcsr =mei_hcsr_read (dev); hw->hbuf_depth = (hcsr &H_CBD ) >>24 ; reg =0 ; -pci_read_config_dword (pdev,PCI_CFG_HFS_1 , ®); + hw->read_fws (dev,PCI_CFG_HFS_1 , ®);trace_mei_pci_cfg_read (dev->dev,"PCI_CFG_HFS_1" ,PCI_CFG_HFS_1 , reg); hw->d0i3_supported = ((reg &PCI_CFG_HFS_1_D0I3_MSK ) ==PCI_CFG_HFS_1_D0I3_MSK );
@@ -233,6 +239,8 @@ static void mei_me_hw_config(struct mei_device *dev)if (reg &H_D0I3C_I3 ) hw->pg_state =MEI_PG_ON ; } + +return 0 ; }/**
drivers/misc/mei/hw-me.h +2 -0
@@ -46,6 +46,7 @@ struct mei_cfg {* @pg_state: power gating state * @d0i3_supported: di03 support * @hbuf_depth: depth of hardware host/write buffer in slots +* @read_fws: read FW status register handler */ struct mei_me_hw {const struct mei_cfg *cfg;
@@ -54,6 +55,7 @@ struct mei_me_hw {enum mei_pg_state pg_state;bool d0i3_supported;u8 hbuf_depth; +int (*read_fws)(const struct mei_device *dev,int where,u32 *val); };#define to_me_hw (dev) (struct mei_me_hw *)((dev)->hw)
drivers/misc/mei/hw-txe.c +7 -3
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) 2013-2014, Intel Corporation. All rights reserved. +* Copyright (c) 2013-2019, Intel Corporation. All rights reserved. * Intel Management Engine Interface (Intel MEI) Linux driver */
@@ -660,14 +660,16 @@ static int mei_txe_fw_status(struct mei_device *dev, }/** -* mei_txe_hw_config - configure hardware at the start of the devices +* mei_txe_hw_config - configure hardware at the start of the devices * * @dev: the device structure * * Configure hardware at the start of the device should be done only * once at the device probe time +* +* Return: always 0 */ -static void mei_txe_hw_config (struct mei_device *dev) +static int mei_txe_hw_config (struct mei_device *dev) {struct mei_txe_hw *hw =to_txe_hw (dev);
@@ -677,6 +679,8 @@ static void mei_txe_hw_config(struct mei_device *dev)dev_dbg (dev->dev,"aliveness_resp = 0x%08x, readiness = 0x%08x.\n" , hw->aliveness, hw->readiness); + +return 0 ; }/**
drivers/misc/mei/init.c +4 -2
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) 2012-2018, Intel Corporation. All rights reserved. +* Copyright (c) 2012-2019, Intel Corporation. All rights reserved. * Intel Management Engine Interface (Intel MEI) Linux driver */
@@ -190,7 +190,9 @@ int mei_start(struct mei_device *dev)/* acknowledge interrupt and stop interrupts */ mei_clear_interrupts (dev); -mei_hw_config (dev); + ret =mei_hw_config (dev); +if (ret) + goto err;dev_dbg (dev->dev,"reset in start the mei device.\n" );
drivers/misc/mei/mei_dev.h +4 -4
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 */ /* -* Copyright (c) 2003-2018, Intel Corporation. All rights reserved. +* Copyright (c) 2003-2019, Intel Corporation. All rights reserved. * Intel Management Engine Interface (Intel MEI) Linux driver */
@@ -287,7 +287,7 @@ struct mei_hw_ops {bool (*hw_is_ready)(struct mei_device *dev);int (*hw_reset)(struct mei_device *dev,bool enable);int (*hw_start)(struct mei_device *dev); -void (*hw_config)(struct mei_device *dev); +int (*hw_config)(struct mei_device *dev);int (*fw_status)(struct mei_device *dev,struct mei_fw_status *fw_sts);enum mei_pg_state (*pg_state)(struct mei_device *dev);
@@ -614,9 +614,9 @@ void mei_irq_compl_handler(struct mei_device *dev, struct list_head *cmpl_list);*/ -static inline void mei_hw_config (struct mei_device *dev) +static inline int mei_hw_config (struct mei_device *dev) { - dev->ops->hw_config (dev); +return dev->ops->hw_config (dev); }static inline enum mei_pg_state mei_pg_state (struct mei_device *dev)
drivers/misc/mei/pci-me.c +8 -0
@@ -121,6 +121,13 @@ static inline void mei_me_set_pm_domain(struct mei_device *dev) {}static inline void mei_me_unset_pm_domain (struct mei_device *dev) {}#endif /* CONFIG_PM */ +static int mei_me_read_fws (const struct mei_device *dev,int where,u32 *val) +{ +struct pci_dev *pdev =to_pci_dev (dev->dev); + +return pci_read_config_dword (pdev, where, val); +} +/** * mei_me_quirk_probe - probe for devices that doesn't valid ME interface *
@@ -200,6 +207,7 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent) hw =to_me_hw (dev); hw->mem_addr =pcim_iomap_table (pdev)[0 ]; hw->irq = pdev->irq; + hw->read_fws = mei_me_read_fws;pci_enable_msi (pdev);
Signature · 1 line
2.21.0