Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1532207 > unrolled thread
| Started by | Tomas Winkler <tomas.winkler@intel.com> |
|---|---|
| First post | 2016-11-29 12:50 +0100 |
| Last post | 2016-11-30 10:50 +0100 |
| Articles | 7 — 3 participants |
Back to article view | Back to linux.kernel
[char-msic 1/3] mei: me: disable driver on SPT SPS firmware Tomas Winkler <tomas.winkler@intel.com> - 2016-11-29 12:50 +0100
Re: [char-msic 1/3] mei: me: disable driver on SPT SPS firmware Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-29 20:20 +0100
RE: [char-msic 1/3] mei: me: disable driver on SPT SPS firmware "Winkler, Tomas" <tomas.winkler@intel.com> - 2016-11-29 20:30 +0100
Re: [char-msic 1/3] mei: me: disable driver on SPT SPS firmware Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-29 22:40 +0100
RE: [char-msic 1/3] mei: me: disable driver on SPT SPS firmware "Winkler, Tomas" <tomas.winkler@intel.com> - 2016-11-29 22:50 +0100
Re: [char-msic 1/3] mei: me: disable driver on SPT SPS firmware Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-30 10:30 +0100
RE: [char-msic 1/3] mei: me: disable driver on SPT SPS firmware "Winkler, Tomas" <tomas.winkler@intel.com> - 2016-11-30 10:50 +0100
| From | Tomas Winkler <tomas.winkler@intel.com> |
|---|---|
| Date | 2016-11-29 12:50 +0100 |
| Subject | [char-msic 1/3] mei: me: disable driver on SPT SPS firmware |
| Message-ID | <sIP57-7Uu-19@gated-at.bofh.it> |
commit 8c57cac1457f3125a5d13dc03635c0708c61bff0 upstream
Sunrise Point PCH with SPS Firmware doesn't expose working
MEI interface, we need to quirk it out.
The SPS Firmware is identifiable only on the first PCI function
of the device.
Cc: <stable@vger.kernel.org> #4.4
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/misc/mei/hw-me.c | 10 ++++++++--
drivers/misc/mei/pci-me.c | 4 ++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
index 25b1997a62cb..36333750c512 100644
--- a/drivers/misc/mei/hw-me.c
+++ b/drivers/misc/mei/hw-me.c
@@ -1258,8 +1258,14 @@ static bool mei_me_fw_type_nm(struct pci_dev *pdev)
static bool mei_me_fw_type_sps(struct pci_dev *pdev)
{
u32 reg;
- /* Read ME FW Status check for SPS Firmware */
- pci_read_config_dword(pdev, PCI_CFG_HFS_1, ®);
+ unsigned int devfn;
+
+ /*
+ * Read ME FW Status register to check for SPS Firmware
+ * The SPS FW is only signaled in pci function 0
+ */
+ devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0);
+ pci_bus_read_config_dword(pdev->bus, devfn, PCI_CFG_HFS_1, ®);
/* if bits [19:16] = 15, running SPS Firmware */
return (reg & 0xf0000) == 0xf0000;
}
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 0af3d7d30419..01e20384ac44 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -84,8 +84,8 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
{MEI_PCI_DEVICE(MEI_DEV_ID_SPT, mei_me_pch8_cfg)},
{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_2, mei_me_pch8_cfg)},
- {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H, mei_me_pch8_cfg)},
- {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H_2, mei_me_pch8_cfg)},
+ {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H, mei_me_pch8_sps_cfg)},
+ {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H_2, mei_me_pch8_sps_cfg)},
{MEI_PCI_DEVICE(MEI_DEV_ID_KBP, mei_me_pch8_cfg)},
{MEI_PCI_DEVICE(MEI_DEV_ID_KBP_2, mei_me_pch8_cfg)},
--
2.7.4
[toc] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2016-11-29 20:20 +0100 |
| Message-ID | <sIW6C-48h-27@gated-at.bofh.it> |
| In reply to | #1532207 |
On Tue, Nov 29, 2016 at 02:44:44PM +0200, Tomas Winkler wrote: > commit 8c57cac1457f3125a5d13dc03635c0708c61bff0 upstream > > Sunrise Point PCH with SPS Firmware doesn't expose working > MEI interface, we need to quirk it out. > The SPS Firmware is identifiable only on the first PCI function > of the device. > > Cc: <stable@vger.kernel.org> #4.4 > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > --- > drivers/misc/mei/hw-me.c | 10 ++++++++-- > drivers/misc/mei/pci-me.c | 4 ++-- > 2 files changed, 10 insertions(+), 4 deletions(-) I don't understand what this is for, it's already in the 4.8-stable tree. And there you said it only needed to go to 4.6 and newer, yet you are saying 4.4 here? What am I supposed to do? confused, greg k-h
[toc] | [prev] | [next] | [standalone]
| From | "Winkler, Tomas" <tomas.winkler@intel.com> |
|---|---|
| Date | 2016-11-29 20:30 +0100 |
| Message-ID | <sIWgh-4bp-7@gated-at.bofh.it> |
| In reply to | #1532693 |
> > On Tue, Nov 29, 2016 at 02:44:44PM +0200, Tomas Winkler wrote: > > commit 8c57cac1457f3125a5d13dc03635c0708c61bff0 upstream > > > > Sunrise Point PCH with SPS Firmware doesn't expose working MEI > > interface, we need to quirk it out. > > The SPS Firmware is identifiable only on the first PCI function of the > > device. > > > > Cc: <stable@vger.kernel.org> #4.4 > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > --- > > drivers/misc/mei/hw-me.c | 10 ++++++++-- drivers/misc/mei/pci-me.c > > | 4 ++-- > > 2 files changed, 10 insertions(+), 4 deletions(-) > > I don't understand what this is for, it's already in the 4.8-stable tree. And there > you said it only needed to go to 4.6 and newer, yet you are saying 4.4 here? > What am I supposed to do? > It's needed 4.4, but the original patch does apply cleanly only from 4.6 up, so this is the rebased version over 4.4. Since 4.4 is a long term kernel this is important. I see from time to time broken patches in stable, mostly in 3.X series, so I prefer to do the back port myself. Thanks Tomas
[toc] | [prev] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2016-11-29 22:40 +0100 |
| Message-ID | <sIYi6-5qJ-15@gated-at.bofh.it> |
| In reply to | #1532703 |
On Tue, Nov 29, 2016 at 07:21:43PM +0000, Winkler, Tomas wrote: > > > > On Tue, Nov 29, 2016 at 02:44:44PM +0200, Tomas Winkler wrote: > > > commit 8c57cac1457f3125a5d13dc03635c0708c61bff0 upstream > > > > > > Sunrise Point PCH with SPS Firmware doesn't expose working MEI > > > interface, we need to quirk it out. > > > The SPS Firmware is identifiable only on the first PCI function of the > > > device. > > > > > > Cc: <stable@vger.kernel.org> #4.4 > > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> > > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > > --- > > > drivers/misc/mei/hw-me.c | 10 ++++++++-- drivers/misc/mei/pci-me.c > > > | 4 ++-- > > > 2 files changed, 10 insertions(+), 4 deletions(-) > > > > I don't understand what this is for, it's already in the 4.8-stable tree. And there > > you said it only needed to go to 4.6 and newer, yet you are saying 4.4 here? > > What am I supposed to do? > > > > It's needed 4.4, but the original patch does apply cleanly only from 4.6 up, so this is the rebased version over 4.4. Since 4.4 is a long term kernel this is important. > I see from time to time broken patches in stable, mostly in 3.X series, so I prefer to do the back port myself. Ok, but your [char-misc] in the subject confused me. Please make this a bit more explicit next time. thanks, greg k-h
[toc] | [prev] | [next] | [standalone]
| From | "Winkler, Tomas" <tomas.winkler@intel.com> |
|---|---|
| Date | 2016-11-29 22:50 +0100 |
| Message-ID | <sIYrL-5u6-13@gated-at.bofh.it> |
| In reply to | #1532793 |
> > On Tue, Nov 29, 2016 at 07:21:43PM +0000, Winkler, Tomas wrote: > > > > > > On Tue, Nov 29, 2016 at 02:44:44PM +0200, Tomas Winkler wrote: > > > > commit 8c57cac1457f3125a5d13dc03635c0708c61bff0 upstream > > > > > > > > Sunrise Point PCH with SPS Firmware doesn't expose working MEI > > > > interface, we need to quirk it out. > > > > The SPS Firmware is identifiable only on the first PCI function of > > > > the device. > > > > > > > > Cc: <stable@vger.kernel.org> #4.4 > > > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> > > > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > > > --- > > > > drivers/misc/mei/hw-me.c | 10 ++++++++-- > > > > drivers/misc/mei/pci-me.c > > > > | 4 ++-- > > > > 2 files changed, 10 insertions(+), 4 deletions(-) > > > > > > I don't understand what this is for, it's already in the 4.8-stable > > > tree. And there you said it only needed to go to 4.6 and newer, yet you are > saying 4.4 here? > > > What am I supposed to do? > > > > > > > It's needed 4.4, but the original patch does apply cleanly only from 4.6 up, so > this is the rebased version over 4.4. Since 4.4 is a long term kernel this is > important. > > I see from time to time broken patches in stable, mostly in 3.X series, so I > prefer to do the back port myself. > > Ok, but your [char-misc] in the subject confused me. Please make this a bit > more explicit next time. I see, it's automated in my scripts. Will [char-misc 4.4] or [stable 4.4] works for you? Thanks Tomas
[toc] | [prev] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2016-11-30 10:30 +0100 |
| Message-ID | <sJ9nb-4fE-11@gated-at.bofh.it> |
| In reply to | #1532802 |
On Tue, Nov 29, 2016 at 09:41:41PM +0000, Winkler, Tomas wrote: > > > > > > On Tue, Nov 29, 2016 at 07:21:43PM +0000, Winkler, Tomas wrote: > > > > > > > > On Tue, Nov 29, 2016 at 02:44:44PM +0200, Tomas Winkler wrote: > > > > > commit 8c57cac1457f3125a5d13dc03635c0708c61bff0 upstream > > > > > > > > > > Sunrise Point PCH with SPS Firmware doesn't expose working MEI > > > > > interface, we need to quirk it out. > > > > > The SPS Firmware is identifiable only on the first PCI function of > > > > > the device. > > > > > > > > > > Cc: <stable@vger.kernel.org> #4.4 > > > > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> > > > > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > > > > --- > > > > > drivers/misc/mei/hw-me.c | 10 ++++++++-- > > > > > drivers/misc/mei/pci-me.c > > > > > | 4 ++-- > > > > > 2 files changed, 10 insertions(+), 4 deletions(-) > > > > > > > > I don't understand what this is for, it's already in the 4.8-stable > > > > tree. And there you said it only needed to go to 4.6 and newer, yet you are > > saying 4.4 here? > > > > What am I supposed to do? > > > > > > > > > > It's needed 4.4, but the original patch does apply cleanly only from 4.6 up, so > > this is the rebased version over 4.4. Since 4.4 is a long term kernel this is > > important. > > > I see from time to time broken patches in stable, mostly in 3.X series, so I > > prefer to do the back port myself. > > > > Ok, but your [char-misc] in the subject confused me. Please make this a bit > > more explicit next time. > > I see, it's automated in my scripts. Will [char-misc 4.4] or [stable 4.4] works for you? It's not that automated as it is misspelled in this series :) Anyway, stable would make more sense, char-misc 4.4 does not mean anything... thanks, greg k-h
[toc] | [prev] | [next] | [standalone]
| From | "Winkler, Tomas" <tomas.winkler@intel.com> |
|---|---|
| Date | 2016-11-30 10:50 +0100 |
| Message-ID | <sJ9Gy-4mz-9@gated-at.bofh.it> |
| In reply to | #1533106 |
> > On Tue, Nov 29, 2016 at 09:41:41PM +0000, Winkler, Tomas wrote: > > > > > > > > > > On Tue, Nov 29, 2016 at 07:21:43PM +0000, Winkler, Tomas wrote: > > > > > > > > > > On Tue, Nov 29, 2016 at 02:44:44PM +0200, Tomas Winkler wrote: > > > > > > commit 8c57cac1457f3125a5d13dc03635c0708c61bff0 upstream > > > > > > > > > > > > Sunrise Point PCH with SPS Firmware doesn't expose working MEI > > > > > > interface, we need to quirk it out. > > > > > > The SPS Firmware is identifiable only on the first PCI > > > > > > function of the device. > > > > > > > > > > > > Cc: <stable@vger.kernel.org> #4.4 > > > > > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> > > > > > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > > > > > --- > > > > > > drivers/misc/mei/hw-me.c | 10 ++++++++-- > > > > > > drivers/misc/mei/pci-me.c > > > > > > | 4 ++-- > > > > > > 2 files changed, 10 insertions(+), 4 deletions(-) > > > > > > > > > > I don't understand what this is for, it's already in the > > > > > 4.8-stable tree. And there you said it only needed to go to 4.6 > > > > > and newer, yet you are > > > saying 4.4 here? > > > > > What am I supposed to do? > > > > > > > > > > > > > It's needed 4.4, but the original patch does apply cleanly only > > > > from 4.6 up, so > > > this is the rebased version over 4.4. Since 4.4 is a long term > > > kernel this is important. > > > > I see from time to time broken patches in stable, mostly in 3.X > > > > series, so I > > > prefer to do the back port myself. > > > > > > Ok, but your [char-misc] in the subject confused me. Please make > > > this a bit more explicit next time. > > > > I see, it's automated in my scripts. Will [char-misc 4.4] or [stable 4.4] works > for you? > > It's not that automated as it is misspelled in this series :) Yes I know, the script is a bit dyslectic., AI is going too far :) > > Anyway, stable would make more sense, char-misc 4.4 does not mean > anything... Okay, will skip to that, Maybe Documentation/stable_kernel_rules.txt need some updates, also not sure you followed the mail thread regarding the git send-email issue https://lkml.org/lkml/2016/11/24/836 Your input will be valued. Thanks Tomas
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web