Message ID | 20121205205740.13851.43284.stgit@bhelgaas.mtv.corp.google.com |
---|---|
State | Not Applicable |
Headers | show |
Acked-by: Saurav Kashyap <saurav.kashyap@qlogic.com> 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 <bhelgaas@google.com> >CC: Andrew Vasquez <andrew.vasquez@qlogic.com> >CC: linux-driver@qlogic.com >CC: "James E.J. Bottomley" <JBottomley@parallels.com> >CC: linux-scsi@vger.kernel.org >--- > 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 majordomo@vger.kernel.org >More majordomo info at http://vger.kernel.org/majordomo-info.html >
Acked-by: Giridhar Malavali On 12/7/12 12:17 AM, "Saurav Kashyap" <saurav.kashyap@qlogic.com> wrote: >Acked-by: Saurav Kashyap <saurav.kashyap@qlogic.com> > >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 <bhelgaas@google.com> >>CC: Andrew Vasquez <andrew.vasquez@qlogic.com> >>CC: linux-driver@qlogic.com >>CC: "James E.J. Bottomley" <JBottomley@parallels.com> >>CC: linux-scsi@vger.kernel.org >>--- >> 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 majordomo@vger.kernel.org >>More majordomo info at http://vger.kernel.org/majordomo-info.html >> > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 <giridhar.malavali@qlogic.com> wrote: > Acked-by: Giridhar Malavali > > On 12/7/12 12:17 AM, "Saurav Kashyap" <saurav.kashyap@qlogic.com> wrote: > >>Acked-by: Saurav Kashyap <saurav.kashyap@qlogic.com> >> >>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 <bhelgaas@google.com> >>>CC: Andrew Vasquez <andrew.vasquez@qlogic.com> >>>CC: linux-driver@qlogic.com >>>CC: "James E.J. Bottomley" <JBottomley@parallels.com> >>>CC: linux-scsi@vger.kernel.org >>>--- >>> 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 majordomo@vger.kernel.org >>>More majordomo info at http://vger.kernel.org/majordomo-info.html >>> >> > > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 <bhelgaas@google.com> 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 > <giridhar.malavali@qlogic.com> wrote: >> Acked-by: Giridhar Malavali >> >> On 12/7/12 12:17 AM, "Saurav Kashyap" <saurav.kashyap@qlogic.com> wrote: >> >>>Acked-by: Saurav Kashyap <saurav.kashyap@qlogic.com> >>> >>>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 <bhelgaas@google.com> >>>>CC: Andrew Vasquez <andrew.vasquez@qlogic.com> >>>>CC: linux-driver@qlogic.com >>>>CC: "James E.J. Bottomley" <JBottomley@parallels.com> >>>>CC: linux-scsi@vger.kernel.org >>>>--- >>>> 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 majordomo@vger.kernel.org >>>>More majordomo info at http://vger.kernel.org/majordomo-info.html >>>> >>> >> >> -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Sorry, I said I was going to push this through my PCI tree, but I forgot all about it. I put it (finally) in my pci/misc branch, and will merge it during the v3.13 merge window. On Fri, Jan 4, 2013 at 12:31 PM, Bjorn Helgaas <bhelgaas@google.com> wrote: > 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 <bhelgaas@google.com> 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 >> <giridhar.malavali@qlogic.com> wrote: >>> Acked-by: Giridhar Malavali >>> >>> On 12/7/12 12:17 AM, "Saurav Kashyap" <saurav.kashyap@qlogic.com> wrote: >>> >>>>Acked-by: Saurav Kashyap <saurav.kashyap@qlogic.com> >>>> >>>>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 <bhelgaas@google.com> >>>>>CC: Andrew Vasquez <andrew.vasquez@qlogic.com> >>>>>CC: linux-driver@qlogic.com >>>>>CC: "James E.J. Bottomley" <JBottomley@parallels.com> >>>>>CC: linux-scsi@vger.kernel.org >>>>>--- >>>>> 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 majordomo@vger.kernel.org >>>>>More majordomo info at http://vger.kernel.org/majordomo-info.html >>>>> >>>> >>> >>> -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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)
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 <bhelgaas@google.com> CC: Andrew Vasquez <andrew.vasquez@qlogic.com> CC: linux-driver@qlogic.com CC: "James E.J. Bottomley" <JBottomley@parallels.com> CC: linux-scsi@vger.kernel.org --- drivers/scsi/qla2xxx/qla_os.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html