From: Bjorn Helgaas <bhelgaas@google.com>
To: Zhou Wang <wangzhou1@hisilicon.com>,
Gabriele Paoloni <gabriele.paoloni@huawei.com>
Cc: linux-pci@vger.kernel.org
Subject: [PATCH v2 6/8] PCI: hisi: Include register block base in PCIE_SYS_STATE4 address
Date: Wed, 12 Oct 2016 08:43:15 -0500 [thread overview]
Message-ID: <20161012134315.28562.3337.stgit@bhelgaas-glaptop2.roam.corp.google.com> (raw)
In-Reply-To: <20161012133904.28562.74066.stgit@bhelgaas-glaptop2.roam.corp.google.com>
Include the PCIE_HIP06_CTRL_OFF block base in the PCIE_SYS_STATE4 register
address so reads of PCIE_SYS_STATE4 don't have to mention both. No
functional change intended.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/host/pcie-hisi.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/pci/host/pcie-hisi.c b/drivers/pci/host/pcie-hisi.c
index d0e081b..b508aae 100644
--- a/drivers/pci/host/pcie-hisi.c
+++ b/drivers/pci/host/pcie-hisi.c
@@ -22,11 +22,11 @@
#include "pcie-designware.h"
-#define PCIE_LTSSM_LINKUP_STATE 0x11
-#define PCIE_LTSSM_STATE_MASK 0x3F
-#define PCIE_SUBCTRL_SYS_STATE4_REG 0x6818
-#define PCIE_SYS_STATE4 0x31c
-#define PCIE_HIP06_CTRL_OFF 0x1000
+#define PCIE_SUBCTRL_SYS_STATE4_REG 0x6818
+#define PCIE_HIP06_CTRL_OFF 0x1000
+#define PCIE_SYS_STATE4 (PCIE_HIP06_CTRL_OFF + 0x31c)
+#define PCIE_LTSSM_LINKUP_STATE 0x11
+#define PCIE_LTSSM_STATE_MASK 0x3F
#define to_hisi_pcie(x) container_of(x, struct hisi_pcie, pp)
@@ -108,7 +108,7 @@ static int hisi_pcie_link_up_hip06(struct hisi_pcie *hisi_pcie)
struct pcie_port *pp = &hisi_pcie->pp;
u32 val;
- val = dw_pcie_readl_rc(pp, PCIE_HIP06_CTRL_OFF + PCIE_SYS_STATE4);
+ val = dw_pcie_readl_rc(pp, PCIE_SYS_STATE4);
return ((val & PCIE_LTSSM_STATE_MASK) == PCIE_LTSSM_LINKUP_STATE);
}
next prev parent reply other threads:[~2016-10-12 13:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-12 13:42 [PATCH v2 0/8] PCI: hisi: Cleanups Bjorn Helgaas
2016-10-12 13:42 ` [PATCH v2 1/8] PCI: hisi: Add local struct device pointers Bjorn Helgaas
2016-10-12 13:42 ` [PATCH v2 2/8] PCI: hisi: Remove unused platform data Bjorn Helgaas
2016-10-12 13:42 ` [PATCH v2 3/8] PCI: hisi: Name private struct pointer "hisi_pcie" consistently Bjorn Helgaas
2016-10-12 13:42 ` [PATCH v2 4/8] PCI: hisi: Remove redundant struct hisi_pcie.reg_base Bjorn Helgaas
2016-10-12 13:43 ` [PATCH v2 5/8] PCI: hisi: Use generic DesignWare accessors Bjorn Helgaas
2016-10-12 13:43 ` Bjorn Helgaas [this message]
2016-10-12 13:43 ` [PATCH v2 7/8] PCI: hisi: Pass device-specific struct to internal functions Bjorn Helgaas
2016-10-12 13:43 ` [PATCH v2 8/8] PCI: hisi: Reorder struct hisi_pcie Bjorn Helgaas
2016-10-12 16:05 ` [PATCH v2 0/8] PCI: hisi: Cleanups Bjorn Helgaas
2016-10-14 2:19 ` Gabriele Paoloni
2016-10-14 2:17 ` Gabriele Paoloni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161012134315.28562.3337.stgit@bhelgaas-glaptop2.roam.corp.google.com \
--to=bhelgaas@google.com \
--cc=gabriele.paoloni@huawei.com \
--cc=linux-pci@vger.kernel.org \
--cc=wangzhou1@hisilicon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).