I haven't heard anything, so I'm going to push this through the PCI tree. Let me know if anybody objects or would like to handle it differently.
On Mon, Dec 17, 2012 at 12:21 PM, Bjorn Helgaas <[email protected]> wrote: > Ping. I didn't push this through my tree because I didn't want to > create conflicts with other changes to this file. But I think this > can be merged any time. > > On Fri, Dec 7, 2012 at 3:29 PM, Giridhar Malavali > <[email protected]> wrote: >> Acked-by: Giridhar Malavali >> >> On 12/7/12 12:17 AM, "Saurav Kashyap" <[email protected]> wrote: >> >>>Acked-by: Saurav Kashyap <[email protected]> >>> >>>Thanks, >>>~Saurav >>> >>> >>> >>>>Use the standard #defines for PCIe Link Capability register fields >>>>rather than bare numbers. This also uses the new PCI Express Capability >>>>accessor rather than reading the capability directly. >>>> >>>>Signed-off-by: Bjorn Helgaas <[email protected]> >>>>CC: Andrew Vasquez <[email protected]> >>>>CC: [email protected] >>>>CC: "James E.J. Bottomley" <[email protected]> >>>>CC: [email protected] >>>>--- >>>> drivers/scsi/qla2xxx/qla_os.c | 14 +++++--------- >>>> 1 files changed, 5 insertions(+), 9 deletions(-) >>>> >>>>diff --git a/drivers/scsi/qla2xxx/qla_os.c >>>>b/drivers/scsi/qla2xxx/qla_os.c >>>>index d501bf5..b5d070f 100644 >>>>--- a/drivers/scsi/qla2xxx/qla_os.c >>>>+++ b/drivers/scsi/qla2xxx/qla_os.c >>>>@@ -480,18 +480,14 @@ qla24xx_pci_info_str(struct scsi_qla_host *vha, >>>>char *str) >>>> static char *pci_bus_modes[] = { "33", "66", "100", "133", }; >>>> struct qla_hw_data *ha = vha->hw; >>>> uint32_t pci_bus; >>>>- int pcie_reg; >>>> >>>>- pcie_reg = pci_pcie_cap(ha->pdev); >>>>- if (pcie_reg) { >>>>+ if (pci_is_pcie(ha->pdev)) { >>>> char lwstr[6]; >>>>- uint16_t pcie_lstat, lspeed, lwidth; >>>>+ uint32_t lstat, lspeed, lwidth; >>>> >>>>- pcie_reg += PCI_EXP_LNKCAP; >>>>- pci_read_config_word(ha->pdev, pcie_reg, &pcie_lstat); >>>>- lspeed = pcie_lstat & (BIT_0 | BIT_1 | BIT_2 | BIT_3); >>>>- lwidth = (pcie_lstat & >>>>- (BIT_4 | BIT_5 | BIT_6 | BIT_7 | BIT_8 | BIT_9)) >> 4; >>>>+ pcie_capability_read_dword(ha->pdev, PCI_EXP_LNKCAP, &lstat); >>>>+ lspeed = lstat & PCI_EXP_LNKCAP_SLS; >>>>+ lwidth = (lstat & PCI_EXP_LNKCAP_MLW) >> 4; >>>> >>>> strcpy(str, "PCIe ("); >>>> if (lspeed == 1) >>>> >>>>-- >>>>To unsubscribe from this list: send the line "unsubscribe linux-scsi" in >>>>the body of a message to [email protected] >>>>More majordomo info at http://vger.kernel.org/majordomo-info.html >>>> >>> >> >> -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
