* [PATCH] rapidio/tsi721: use PCI_EXP_DEVCTL2_COMP_TIMEOUT macro
@ 2017-12-15 22:59 Bjorn Helgaas
2017-12-18 15:25 ` Bounine, Alexandre
0 siblings, 1 reply; 3+ messages in thread
From: Bjorn Helgaas @ 2017-12-15 22:59 UTC (permalink / raw)
To: Alexandre Bounine, Matt Porter; +Cc: linux-pci
From: Bjorn Helgaas <bhelgaas@google.com>
Use the existing PCI_EXP_DEVCTL2_COMP_TIMEOUT macro instead of hard-coding
the PCIe Completion Timeout Value mask. No functional change intended.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/rapidio/devices/tsi721.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c
index 9a68914100ad..bb655854713d 100644
--- a/drivers/rapidio/devices/tsi721.c
+++ b/drivers/rapidio/devices/tsi721.c
@@ -2880,8 +2880,9 @@ static int tsi721_probe(struct pci_dev *pdev,
"Invalid MRRS override value %d", pcie_mrrs);
}
- /* Adjust PCIe completion timeout. */
- pcie_capability_clear_and_set_word(pdev, PCI_EXP_DEVCTL2, 0xf, 0x2);
+ /* Set PCIe completion timeout to 1-10ms */
+ pcie_capability_clear_and_set_word(pdev, PCI_EXP_DEVCTL2,
+ PCI_EXP_DEVCTL2_COMP_TIMEOUT, 0x2);
/*
* FIXUP: correct offsets of MSI-X tables in the MSI-X Capability Block
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH] rapidio/tsi721: use PCI_EXP_DEVCTL2_COMP_TIMEOUT macro
2017-12-15 22:59 [PATCH] rapidio/tsi721: use PCI_EXP_DEVCTL2_COMP_TIMEOUT macro Bjorn Helgaas
@ 2017-12-18 15:25 ` Bounine, Alexandre
2018-02-16 0:42 ` Bjorn Helgaas
0 siblings, 1 reply; 3+ messages in thread
From: Bounine, Alexandre @ 2017-12-18 15:25 UTC (permalink / raw)
To: Bjorn Helgaas, Matt Porter; +Cc: linux-pci, Andrew Morton
QWNrZWQtYnk6IEFsZXhhbmRyZSBCb3VuaW5lIDxhbGV4YW5kcmUuYm91bmluZUBpZHQuY29tPg0K
DQpIaSBBbmRyZXcsDQoNClBsZWFzZSBhcHBseSB0aGUgcGF0Y2ggYmVsb3cuDQogDQpUaGFuayB5
b3UsICANCg0KQWxleC4NCg0KLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCkZyb206IEJqb3Ju
IEhlbGdhYXMgW21haWx0bzpoZWxnYWFzQGtlcm5lbC5vcmddIA0KU2VudDogRnJpZGF5LCBEZWNl
bWJlciAxNSwgMjAxNyA2OjAwIFBNDQpUbzogQm91bmluZSwgQWxleGFuZHJlIDxBbGV4YW5kcmUu
Qm91bmluZUBpZHQuY29tPjsgTWF0dCBQb3J0ZXIgPG1wb3J0ZXJAa2VybmVsLmNyYXNoaW5nLm9y
Zz4NCkNjOiBsaW51eC1wY2lAdmdlci5rZXJuZWwub3JnDQpTdWJqZWN0OiBbUEFUQ0hdIHJhcGlk
aW8vdHNpNzIxOiB1c2UgUENJX0VYUF9ERVZDVEwyX0NPTVBfVElNRU9VVCBtYWNybw0KDQpGcm9t
OiBCam9ybiBIZWxnYWFzIDxiaGVsZ2Fhc0Bnb29nbGUuY29tPg0KDQpVc2UgdGhlIGV4aXN0aW5n
IFBDSV9FWFBfREVWQ1RMMl9DT01QX1RJTUVPVVQgbWFjcm8gaW5zdGVhZCBvZiBoYXJkLWNvZGlu
Zw0KdGhlIFBDSWUgQ29tcGxldGlvbiBUaW1lb3V0IFZhbHVlIG1hc2suICBObyBmdW5jdGlvbmFs
IGNoYW5nZSBpbnRlbmRlZC4NCg0KU2lnbmVkLW9mZi1ieTogQmpvcm4gSGVsZ2FhcyA8YmhlbGdh
YXNAZ29vZ2xlLmNvbT4NCi0tLQ0KIGRyaXZlcnMvcmFwaWRpby9kZXZpY2VzL3RzaTcyMS5jIHwg
ICAgNSArKystLQ0KIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25z
KC0pDQoNCmRpZmYgLS1naXQgYS9kcml2ZXJzL3JhcGlkaW8vZGV2aWNlcy90c2k3MjEuYyBiL2Ry
aXZlcnMvcmFwaWRpby9kZXZpY2VzL3RzaTcyMS5jDQppbmRleCA5YTY4OTE0MTAwYWQuLmJiNjU1
ODU0NzEzZCAxMDA2NDQNCi0tLSBhL2RyaXZlcnMvcmFwaWRpby9kZXZpY2VzL3RzaTcyMS5jDQor
KysgYi9kcml2ZXJzL3JhcGlkaW8vZGV2aWNlcy90c2k3MjEuYw0KQEAgLTI4ODAsOCArMjg4MCw5
IEBAIHN0YXRpYyBpbnQgdHNpNzIxX3Byb2JlKHN0cnVjdCBwY2lfZGV2ICpwZGV2LA0KIAkJCQkg
IkludmFsaWQgTVJSUyBvdmVycmlkZSB2YWx1ZSAlZCIsIHBjaWVfbXJycyk7DQogCX0NCiANCi0J
LyogQWRqdXN0IFBDSWUgY29tcGxldGlvbiB0aW1lb3V0LiAqLw0KLQlwY2llX2NhcGFiaWxpdHlf
Y2xlYXJfYW5kX3NldF93b3JkKHBkZXYsIFBDSV9FWFBfREVWQ1RMMiwgMHhmLCAweDIpOw0KKwkv
KiBTZXQgUENJZSBjb21wbGV0aW9uIHRpbWVvdXQgdG8gMS0xMG1zICovDQorCXBjaWVfY2FwYWJp
bGl0eV9jbGVhcl9hbmRfc2V0X3dvcmQocGRldiwgUENJX0VYUF9ERVZDVEwyLA0KKwkJCQkJICAg
UENJX0VYUF9ERVZDVEwyX0NPTVBfVElNRU9VVCwgMHgyKTsNCiANCiAJLyoNCiAJICogRklYVVA6
IGNvcnJlY3Qgb2Zmc2V0cyBvZiBNU0ktWCB0YWJsZXMgaW4gdGhlIE1TSS1YIENhcGFiaWxpdHkg
QmxvY2sNCg0K
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] rapidio/tsi721: use PCI_EXP_DEVCTL2_COMP_TIMEOUT macro
2017-12-18 15:25 ` Bounine, Alexandre
@ 2018-02-16 0:42 ` Bjorn Helgaas
0 siblings, 0 replies; 3+ messages in thread
From: Bjorn Helgaas @ 2018-02-16 0:42 UTC (permalink / raw)
To: Bounine, Alexandre; +Cc: Matt Porter, linux-pci, Andrew Morton
On Mon, Dec 18, 2017 at 03:25:19PM +0000, Bounine, Alexandre wrote:
> Acked-by: Alexandre Bounine <alexandre.bounine@idt.com>
>
> Hi Andrew,
>
> Please apply the patch below.
Applied with Alexandre's ack to pci/misc for v4.17.
> -----Original Message-----
> From: Bjorn Helgaas [mailto:helgaas@kernel.org]
> Sent: Friday, December 15, 2017 6:00 PM
> To: Bounine, Alexandre <Alexandre.Bounine@idt.com>; Matt Porter <mporter@kernel.crashing.org>
> Cc: linux-pci@vger.kernel.org
> Subject: [PATCH] rapidio/tsi721: use PCI_EXP_DEVCTL2_COMP_TIMEOUT macro
>
> From: Bjorn Helgaas <bhelgaas@google.com>
>
> Use the existing PCI_EXP_DEVCTL2_COMP_TIMEOUT macro instead of hard-coding
> the PCIe Completion Timeout Value mask. No functional change intended.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
> drivers/rapidio/devices/tsi721.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c
> index 9a68914100ad..bb655854713d 100644
> --- a/drivers/rapidio/devices/tsi721.c
> +++ b/drivers/rapidio/devices/tsi721.c
> @@ -2880,8 +2880,9 @@ static int tsi721_probe(struct pci_dev *pdev,
> "Invalid MRRS override value %d", pcie_mrrs);
> }
>
> - /* Adjust PCIe completion timeout. */
> - pcie_capability_clear_and_set_word(pdev, PCI_EXP_DEVCTL2, 0xf, 0x2);
> + /* Set PCIe completion timeout to 1-10ms */
> + pcie_capability_clear_and_set_word(pdev, PCI_EXP_DEVCTL2,
> + PCI_EXP_DEVCTL2_COMP_TIMEOUT, 0x2);
>
> /*
> * FIXUP: correct offsets of MSI-X tables in the MSI-X Capability Block
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-02-16 0:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-15 22:59 [PATCH] rapidio/tsi721: use PCI_EXP_DEVCTL2_COMP_TIMEOUT macro Bjorn Helgaas
2017-12-18 15:25 ` Bounine, Alexandre
2018-02-16 0:42 ` Bjorn Helgaas
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.