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

mei: me: store irq number in the hw struct. 



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

Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Link: https://lore.kernel.org/r/20191106223841.15802-3-tomas.winkler@intel.com


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

drivers/misc/mei/hw-me.c

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE