diff options
Diffstat (limited to 'drivers/misc/mei')
| -rw-r--r-- | drivers/misc/mei/hw-me-regs.h | 2 | ||||
| -rw-r--r-- | drivers/misc/mei/mei_lb.c | 3 | ||||
| -rw-r--r-- | drivers/misc/mei/pci-me.c | 2 | ||||
| -rw-r--r-- | drivers/misc/mei/pci-txe.c | 14 | 
4 files changed, 12 insertions, 9 deletions
| diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h index bc40b940ae21..a4f75dc36929 100644 --- a/drivers/misc/mei/hw-me-regs.h +++ b/drivers/misc/mei/hw-me-regs.h @@ -120,6 +120,8 @@  #define MEI_DEV_ID_PTL_H      0xE370  /* Panther Lake H */  #define MEI_DEV_ID_PTL_P      0xE470  /* Panther Lake P */ +#define MEI_DEV_ID_WCL_P      0x4D70  /* Wildcat Lake P */ +  /*   * MEI HW Section   */ diff --git a/drivers/misc/mei/mei_lb.c b/drivers/misc/mei/mei_lb.c index 77686b108d3c..78717ee8ac9a 100644 --- a/drivers/misc/mei/mei_lb.c +++ b/drivers/misc/mei/mei_lb.c @@ -134,8 +134,7 @@ static bool mei_lb_check_response(const struct device *dev, ssize_t bytes,  	return true;  } -static int mei_lb_push_payload(struct device *dev, -			       enum intel_lb_type type, u32 flags, +static int mei_lb_push_payload(struct device *dev, u32 type, u32 flags,  			       const void *payload, size_t payload_size)  {  	struct mei_cl_device *cldev; diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index b108a7c22388..b017ff29dbd1 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c @@ -127,6 +127,8 @@ static const struct pci_device_id mei_me_pci_tbl[] = {  	{MEI_PCI_DEVICE(MEI_DEV_ID_PTL_H, MEI_ME_PCH15_CFG)},  	{MEI_PCI_DEVICE(MEI_DEV_ID_PTL_P, MEI_ME_PCH15_CFG)}, +	{MEI_PCI_DEVICE(MEI_DEV_ID_WCL_P, MEI_ME_PCH15_CFG)}, +  	/* required last entry */  	{0, }  }; diff --git a/drivers/misc/mei/pci-txe.c b/drivers/misc/mei/pci-txe.c index c9eb5c5393e4..06b55a891c6b 100644 --- a/drivers/misc/mei/pci-txe.c +++ b/drivers/misc/mei/pci-txe.c @@ -109,19 +109,19 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)  		goto end;  	} +	err = mei_register(dev, &pdev->dev); +	if (err) +		goto release_irq; +  	if (mei_start(dev)) {  		dev_err(&pdev->dev, "init hw failure.\n");  		err = -ENODEV; -		goto release_irq; +		goto deregister;  	}  	pm_runtime_set_autosuspend_delay(&pdev->dev, MEI_TXI_RPM_TIMEOUT);  	pm_runtime_use_autosuspend(&pdev->dev); -	err = mei_register(dev, &pdev->dev); -	if (err) -		goto stop; -  	pci_set_drvdata(pdev, dev);  	/* @@ -144,8 +144,8 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)  	return 0; -stop: -	mei_stop(dev); +deregister: +	mei_deregister(dev);  release_irq:  	mei_cancel_work(dev);  	mei_disable_interrupts(dev); | 
