The patch titled
pci-x-pci-express-read-control-interfaces-qla2xxx fix
has been removed from the -mm tree. Its filename was
pci-x-pci-express-read-control-interfaces-qla2xxx-fix.patch
This patch was dropped because it was folded into pci-x-pci-express-read-control-interfaces-qla2xxx.patch
------------------------------------------------------
Subject: pci-x-pci-express-read-control-interfaces-qla2xxx fix
From: "Peter Oruba" <peter.oruba@xxxxxxx>
Sorry, I missed out an essential part in the qla2xxx driver, namely the MMRBC
configuration for PCI-X. The submitted patch only did that for PCIe. This is
the corrected version
The pre-condition check is there to not blindly call the mmrbc-functions, but
to check for the bus type first. Indeed, the first patch version made this
check look unnecessary.
Signed-off-by: Peter Oruba <peter.oruba@xxxxxxx>
Cc: Stephen Hemminger <shemminger@xxxxxxxxxxxxxxxxxxxx>
Cc: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/scsi/qla2xxx/qla_init.c | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff -puN drivers/scsi/qla2xxx/qla_init.c~pci-x-pci-express-read-control-interfaces-qla2xxx-fix drivers/scsi/qla2xxx/qla_init.c
--- a/drivers/scsi/qla2xxx/qla_init.c~pci-x-pci-express-read-control-interfaces-qla2xxx-fix
+++ a/drivers/scsi/qla2xxx/qla_init.c
@@ -269,21 +269,15 @@ qla24xx_pci_config(scsi_qla_host_t *ha)
/* PCI-X -- adjust Maximum Memory Read Byte Count (2048). */
pcix_cmd_reg = pci_find_capability(ha->pdev, PCI_CAP_ID_PCIX);
- if (pcix_cmd_reg) {
- uint16_t pcix_cmd;
-
- pcix_cmd_reg += PCI_X_CMD;
- pci_read_config_word(ha->pdev, pcix_cmd_reg, &pcix_cmd);
- pcix_cmd &= ~PCI_X_CMD_MAX_READ;
- pcix_cmd |= 0x0008;
- pci_write_config_word(ha->pdev, pcix_cmd_reg, pcix_cmd);
- }
+ if (pcix_cmd_reg)
+ if (pcix_set_mmrbc(ha->pdev, 2048))
+ DEBUG2(printk("Couldn't write PCI-X read request\n"));
/* PCIe -- adjust Maximum Read Request Size (2048). */
pcie_dctl_reg = pci_find_capability(ha->pdev, PCI_CAP_ID_EXP);
if (pcie_dctl_reg)
- if (pcie_set_readrq(ha->pdev, 2048))
- DEBUG2(printk("Couldn't write PCI Express read request\n"));
+ if (pcie_set_readrq(ha->pdev, 2048))
+ DEBUG2(printk("Couldn't write PCI Express read request\n"));
/* Reset expansion ROM address decode enable */
pci_read_config_dword(ha->pdev, PCI_ROM_ADDRESS, &d);
_
Patches currently in -mm which might be from peter.oruba@xxxxxxx are
bugfix-cpufreq-in-combination-with-performance-governor.patch
pci-x-pci-express-read-control-interfaces-fix.patch
pci-x-pci-express-read-control-interfaces-myrinet.patch
pci-x-pci-express-read-control-interfaces-mthca.patch
pci-x-pci-express-read-control-interfaces-e1000.patch
pci-x-pci-express-read-control-interfaces-qla2xxx.patch
pci-x-pci-express-read-control-interfaces-qla2xxx-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
