From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from szxga02-in.huawei.com ([119.145.14.65]:59122 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756968Ab3IEHiG (ORCPT ); Thu, 5 Sep 2013 03:38:06 -0400 Message-ID: <522834A3.5030506@huawei.com> Date: Thu, 5 Sep 2013 15:37:07 +0800 From: Yijing Wang MIME-Version: 1.0 To: Bjorn Helgaas CC: Benjamin Herrenschmidt , Gavin Shan , "James E.J. Bottomley" , "David S. Miller" , , , Hanjun Guo , Jiang Liu , Naresh Kumar Inna , Jesper Juhl , Subject: Re: [PATCH 2/7] scsi/csiostor: use pcie_capability_xxx to simplify code References: <1378193715-25328-1-git-send-email-wangyijing@huawei.com> <1378193715-25328-2-git-send-email-wangyijing@huawei.com> <20130903234328.GC24733@google.com> In-Reply-To: <20130903234328.GC24733@google.com> Content-Type: text/plain; charset="ISO-8859-1" Sender: linux-pci-owner@vger.kernel.org List-ID: On 2013/9/4 7:43, Bjorn Helgaas wrote: > On Tue, Sep 03, 2013 at 03:35:10PM +0800, Yijing Wang wrote: >> Pcie_capability_xxx() interfaces were introudced to > > s/introudced/introduced/ Will update it. > >> simplify code to access PCIe Cap config space. And >> because PCI core saves the PCIe Cap offset in >> set_pcie_port_type() when device is enumerated. >> So we can use pci_is_pcie() instead. >> >> Signed-off-by: Yijing Wang >> Cc: Jiang Liu >> Cc: "James E.J. Bottomley" >> Cc: Naresh Kumar Inna >> Cc: "David S. Miller" >> Cc: Jesper Juhl >> Cc: linux-scsi@vger.kernel.org >> Cc: linux-kernel@vger.kernel.org >> --- >> drivers/scsi/csiostor/csio_hw.c | 9 +++------ >> 1 files changed, 3 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/scsi/csiostor/csio_hw.c b/drivers/scsi/csiostor/csio_hw.c >> index 0eb35b9..be9a6ef 100644 >> --- a/drivers/scsi/csiostor/csio_hw.c >> +++ b/drivers/scsi/csiostor/csio_hw.c >> @@ -856,15 +856,12 @@ static void >> csio_set_pcie_completion_timeout(struct csio_hw *hw, u8 range) >> { >> uint16_t val; >> - int pcie_cap; >> >> - if (!csio_pci_capability(hw->pdev, PCI_CAP_ID_EXP, &pcie_cap)) { >> - pci_read_config_word(hw->pdev, >> - pcie_cap + PCI_EXP_DEVCTL2, &val); >> + if (pci_is_pcie(hw->pdev)) { >> + pcie_capability_read_word(hw->pdev, PCI_EXP_DEVCTL2, &val); >> val &= 0xfff0; >> val |= range ; >> - pci_write_config_word(hw->pdev, >> - pcie_cap + PCI_EXP_DEVCTL2, val); >> + pcie_capability_write_word(hw->pdev, PCI_EXP_DEVCTL2, val); > > Please add a #define for the Completion Timeout Value field and use > pcie_capability_clear_and_set_word() instead of writing it out the > long way here. Will update it, thanks! > >> } >> } >> >> -- >> 1.7.1 >> >> > > . > -- Thanks! Yijing From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yijing Wang Subject: Re: [PATCH 2/7] scsi/csiostor: use pcie_capability_xxx to simplify code Date: Thu, 5 Sep 2013 15:37:07 +0800 Message-ID: <522834A3.5030506@huawei.com> References: <1378193715-25328-1-git-send-email-wangyijing@huawei.com> <1378193715-25328-2-git-send-email-wangyijing@huawei.com> <20130903234328.GC24733@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20130903234328.GC24733@google.com> Sender: linux-pci-owner@vger.kernel.org To: Bjorn Helgaas Cc: Benjamin Herrenschmidt , Gavin Shan , "James E.J. Bottomley" , "David S. Miller" , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Hanjun Guo , Jiang Liu , Naresh Kumar Inna , Jesper Juhl , linux-scsi@vger.kernel.org List-Id: linux-scsi@vger.kernel.org On 2013/9/4 7:43, Bjorn Helgaas wrote: > On Tue, Sep 03, 2013 at 03:35:10PM +0800, Yijing Wang wrote: >> Pcie_capability_xxx() interfaces were introudced to > > s/introudced/introduced/ Will update it. > >> simplify code to access PCIe Cap config space. And >> because PCI core saves the PCIe Cap offset in >> set_pcie_port_type() when device is enumerated. >> So we can use pci_is_pcie() instead. >> >> Signed-off-by: Yijing Wang >> Cc: Jiang Liu >> Cc: "James E.J. Bottomley" >> Cc: Naresh Kumar Inna >> Cc: "David S. Miller" >> Cc: Jesper Juhl >> Cc: linux-scsi@vger.kernel.org >> Cc: linux-kernel@vger.kernel.org >> --- >> drivers/scsi/csiostor/csio_hw.c | 9 +++------ >> 1 files changed, 3 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/scsi/csiostor/csio_hw.c b/drivers/scsi/csiostor/csio_hw.c >> index 0eb35b9..be9a6ef 100644 >> --- a/drivers/scsi/csiostor/csio_hw.c >> +++ b/drivers/scsi/csiostor/csio_hw.c >> @@ -856,15 +856,12 @@ static void >> csio_set_pcie_completion_timeout(struct csio_hw *hw, u8 range) >> { >> uint16_t val; >> - int pcie_cap; >> >> - if (!csio_pci_capability(hw->pdev, PCI_CAP_ID_EXP, &pcie_cap)) { >> - pci_read_config_word(hw->pdev, >> - pcie_cap + PCI_EXP_DEVCTL2, &val); >> + if (pci_is_pcie(hw->pdev)) { >> + pcie_capability_read_word(hw->pdev, PCI_EXP_DEVCTL2, &val); >> val &= 0xfff0; >> val |= range ; >> - pci_write_config_word(hw->pdev, >> - pcie_cap + PCI_EXP_DEVCTL2, val); >> + pcie_capability_write_word(hw->pdev, PCI_EXP_DEVCTL2, val); > > Please add a #define for the Completion Timeout Value field and use > pcie_capability_clear_and_set_word() instead of writing it out the > long way here. Will update it, thanks! > >> } >> } >> >> -- >> 1.7.1 >> >> > > . > -- Thanks! Yijing