| Message ID | 20210811185955.3112534-1-kuba@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | pci: ptm: remove error message at boot | expand |
On Wed, 2021-08-11 at 11:59 -0700, Jakub Kicinski wrote: > Since commit 39850ed51062 ("PCI/PTM: Save/restore Precision > Time Measurement Capability for suspend/resume") devices > which have PTM capability but don't enable it see this > message on calls to pci_save_state(): > > "no suspend buffer for PTM" > > Drop the message, it's perfectly fine not to use a capability. Ack. Thanks. > > Fixes: 39850ed51062 ("PCI/PTM: Save/restore Precision Time > Measurement Capability for suspend/resume") > Signed-off-by: Jakub Kicinski <kuba@kernel.org> > --- > drivers/pci/pcie/ptm.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/pci/pcie/ptm.c b/drivers/pci/pcie/ptm.c > index 95d4eef2c9e8..4810faa67f52 100644 > --- a/drivers/pci/pcie/ptm.c > +++ b/drivers/pci/pcie/ptm.c > @@ -60,10 +60,8 @@ void pci_save_ptm_state(struct pci_dev *dev) > return; > > save_state = pci_find_saved_ext_cap(dev, PCI_EXT_CAP_ID_PTM); > - if (!save_state) { > - pci_err(dev, "no suspend buffer for PTM\n"); > + if (!save_state) > return; > - } > > cap = (u16 *)&save_state->cap.data[0]; > pci_read_config_word(dev, ptm + PCI_PTM_CTRL, cap);
On Wed, Aug 11, 2021 at 11:59:55AM -0700, Jakub Kicinski wrote: > Since commit 39850ed51062 ("PCI/PTM: Save/restore Precision > Time Measurement Capability for suspend/resume") devices > which have PTM capability but don't enable it see this > message on calls to pci_save_state(): > > "no suspend buffer for PTM" > > Drop the message, it's perfectly fine not to use a capability. > > Fixes: 39850ed51062 ("PCI/PTM: Save/restore Precision Time Measurement Capability for suspend/resume") > Signed-off-by: Jakub Kicinski <kuba@kernel.org> Applied to pci/misc for v5.15, thanks! I fixed your subject line to match previous ones and converted David's informal ack to an actual "Acked-by". > --- > drivers/pci/pcie/ptm.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/pci/pcie/ptm.c b/drivers/pci/pcie/ptm.c > index 95d4eef2c9e8..4810faa67f52 100644 > --- a/drivers/pci/pcie/ptm.c > +++ b/drivers/pci/pcie/ptm.c > @@ -60,10 +60,8 @@ void pci_save_ptm_state(struct pci_dev *dev) > return; > > save_state = pci_find_saved_ext_cap(dev, PCI_EXT_CAP_ID_PTM); > - if (!save_state) { > - pci_err(dev, "no suspend buffer for PTM\n"); > + if (!save_state) > return; > - } > > cap = (u16 *)&save_state->cap.data[0]; > pci_read_config_word(dev, ptm + PCI_PTM_CTRL, cap); > -- > 2.31.1 >
diff --git a/drivers/pci/pcie/ptm.c b/drivers/pci/pcie/ptm.c index 95d4eef2c9e8..4810faa67f52 100644 --- a/drivers/pci/pcie/ptm.c +++ b/drivers/pci/pcie/ptm.c @@ -60,10 +60,8 @@ void pci_save_ptm_state(struct pci_dev *dev) return; save_state = pci_find_saved_ext_cap(dev, PCI_EXT_CAP_ID_PTM); - if (!save_state) { - pci_err(dev, "no suspend buffer for PTM\n"); + if (!save_state) return; - } cap = (u16 *)&save_state->cap.data[0]; pci_read_config_word(dev, ptm + PCI_PTM_CTRL, cap);
Since commit 39850ed51062 ("PCI/PTM: Save/restore Precision Time Measurement Capability for suspend/resume") devices which have PTM capability but don't enable it see this message on calls to pci_save_state(): "no suspend buffer for PTM" Drop the message, it's perfectly fine not to use a capability. Fixes: 39850ed51062 ("PCI/PTM: Save/restore Precision Time Measurement Capability for suspend/resume") Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- drivers/pci/pcie/ptm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)