* [PATCH 1/5] PCI: Add defines for max read request sizes
@ 2015-01-26 17:05 Rafał Miłecki
2015-01-26 17:06 ` [PATCH 4/5] [SCSI] esas2r: use PCI define for max read request size Rafał Miłecki
2015-01-27 0:20 ` [PATCH 1/5] PCI: Add defines for max read request sizes Bjorn Helgaas
0 siblings, 2 replies; 3+ messages in thread
From: Rafał Miłecki @ 2015-01-26 17:05 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci
Cc: Matt Porter, Alexandre Bounine, Chris Metcalf, Bradley Grove,
linux-scsi, Realtek linux nic maintainers, netdev,
Rafał Miłecki
There are few drivers using magic numbers when operating with PCIe
capabilities and PCI_EXP_DEVCTL_READRQ. Define known values to allow
cleaning their code a bit.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
include/uapi/linux/pci_regs.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
index 4a1d0cc..efe3443 100644
--- a/include/uapi/linux/pci_regs.h
+++ b/include/uapi/linux/pci_regs.h
@@ -451,6 +451,10 @@
#define PCI_EXP_DEVCTL_AUX_PME 0x0400 /* Auxiliary Power PM Enable */
#define PCI_EXP_DEVCTL_NOSNOOP_EN 0x0800 /* Enable No Snoop */
#define PCI_EXP_DEVCTL_READRQ 0x7000 /* Max_Read_Request_Size */
+#define PCI_EXP_DEVCTL_READRQ_128B 0x0000 /* 128 Bytes */
+#define PCI_EXP_DEVCTL_READRQ_256B 0x1000 /* 256 Bytes */
+#define PCI_EXP_DEVCTL_READRQ_512B 0x2000 /* 512 Bytes */
+#define PCI_EXP_DEVCTL_READRQ_1024B 0x3000 /* 1024 Bytes */
#define PCI_EXP_DEVCTL_BCR_FLR 0x8000 /* Bridge Configuration Retry / FLR */
#define PCI_EXP_DEVSTA 10 /* Device Status */
#define PCI_EXP_DEVSTA_CED 0x0001 /* Correctable Error Detected */
--
1.8.4.5
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 4/5] [SCSI] esas2r: use PCI define for max read request size
2015-01-26 17:05 [PATCH 1/5] PCI: Add defines for max read request sizes Rafał Miłecki
@ 2015-01-26 17:06 ` Rafał Miłecki
2015-01-27 0:20 ` [PATCH 1/5] PCI: Add defines for max read request sizes Bjorn Helgaas
1 sibling, 0 replies; 3+ messages in thread
From: Rafał Miłecki @ 2015-01-26 17:06 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci
Cc: Bradley Grove, linux-scsi, Rafał Miłecki
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
drivers/scsi/esas2r/esas2r_init.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/esas2r/esas2r_init.c b/drivers/scsi/esas2r/esas2r_init.c
index 6776931..c0b37a5 100644
--- a/drivers/scsi/esas2r/esas2r_init.c
+++ b/drivers/scsi/esas2r/esas2r_init.c
@@ -813,12 +813,13 @@ static void esas2r_init_pci_cfg_space(struct esas2r_adapter *a)
pci_read_config_word(a->pcid, pcie_cap_reg + PCI_EXP_DEVCTL,
&devcontrol);
- if ((devcontrol & PCI_EXP_DEVCTL_READRQ) > 0x2000) {
+ if (devcontrol & PCI_EXP_DEVCTL_READRQ >
+ PCI_EXP_DEVCTL_READRQ_512B) {
esas2r_log(ESAS2R_LOG_INFO,
"max read request size > 512B");
devcontrol &= ~PCI_EXP_DEVCTL_READRQ;
- devcontrol |= 0x2000;
+ devcontrol |= PCI_EXP_DEVCTL_READRQ_512B;
pci_write_config_word(a->pcid,
pcie_cap_reg + PCI_EXP_DEVCTL,
devcontrol);
--
1.8.4.5
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/5] PCI: Add defines for max read request sizes
2015-01-26 17:05 [PATCH 1/5] PCI: Add defines for max read request sizes Rafał Miłecki
2015-01-26 17:06 ` [PATCH 4/5] [SCSI] esas2r: use PCI define for max read request size Rafał Miłecki
@ 2015-01-27 0:20 ` Bjorn Helgaas
1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Helgaas @ 2015-01-27 0:20 UTC (permalink / raw)
To: Rafał Miłecki
Cc: linux-pci, Matt Porter, Alexandre Bounine, Chris Metcalf,
Bradley Grove, linux-scsi, Realtek linux nic maintainers, netdev
On Mon, Jan 26, 2015 at 06:05:22PM +0100, Rafał Miłecki wrote:
> There are few drivers using magic numbers when operating with PCIe
> capabilities and PCI_EXP_DEVCTL_READRQ. Define known values to allow
> cleaning their code a bit.
>
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
I applied this whole series, with acks from Alexandre and Chris, to
pci/misc for v3.20, thanks!
> ---
> include/uapi/linux/pci_regs.h | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
> index 4a1d0cc..efe3443 100644
> --- a/include/uapi/linux/pci_regs.h
> +++ b/include/uapi/linux/pci_regs.h
> @@ -451,6 +451,10 @@
> #define PCI_EXP_DEVCTL_AUX_PME 0x0400 /* Auxiliary Power PM Enable */
> #define PCI_EXP_DEVCTL_NOSNOOP_EN 0x0800 /* Enable No Snoop */
> #define PCI_EXP_DEVCTL_READRQ 0x7000 /* Max_Read_Request_Size */
> +#define PCI_EXP_DEVCTL_READRQ_128B 0x0000 /* 128 Bytes */
> +#define PCI_EXP_DEVCTL_READRQ_256B 0x1000 /* 256 Bytes */
> +#define PCI_EXP_DEVCTL_READRQ_512B 0x2000 /* 512 Bytes */
> +#define PCI_EXP_DEVCTL_READRQ_1024B 0x3000 /* 1024 Bytes */
> #define PCI_EXP_DEVCTL_BCR_FLR 0x8000 /* Bridge Configuration Retry / FLR */
> #define PCI_EXP_DEVSTA 10 /* Device Status */
> #define PCI_EXP_DEVSTA_CED 0x0001 /* Correctable Error Detected */
> --
> 1.8.4.5
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-27 0:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-26 17:05 [PATCH 1/5] PCI: Add defines for max read request sizes Rafał Miłecki
2015-01-26 17:06 ` [PATCH 4/5] [SCSI] esas2r: use PCI define for max read request size Rafał Miłecki
2015-01-27 0:20 ` [PATCH 1/5] PCI: Add defines for max read request sizes Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).