mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: John Garry <john.garry@huawei.com>
To: <jejb@linux.vnet.ibm.com>, <martin.petersen@oracle.com>
Cc: <john.garry2@mail.dcu.ie>, <linuxarm@huawei.com>,
	<linux-scsi@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<arnd@arndb.de>, Xiang Chen <chenxiang66@hisilicon.com>,
	John Garry <john.garry@huawei.com>
Subject: [PATCH v2 21/22] scsi: hisi_sas: add v3 code to fill some more hw function pointers
Date: Thu, 25 May 2017 20:05:10 +0800	[thread overview]
Message-ID: <1495713911-80476-22-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1495713911-80476-1-git-send-email-john.garry@huawei.com>

From: Xiang Chen <chenxiang66@hisilicon.com>

Add code to fill the interface of phy_hard_reset, phy_get_max_linkrate,
and phy enable/disable.

Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
---
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 39 ++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 9add347..4a6f5c7 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -195,6 +195,8 @@
 #define TXID_AUTO				(PORT_BASE + 0xb8)
 #define CT3_OFF		1
 #define CT3_MSK		(0x1 << CT3_OFF)
+#define TX_HARDRST_OFF          2
+#define TX_HARDRST_MSK          (0x1 << TX_HARDRST_OFF)
 #define RX_IDAF_DWORD0			(PORT_BASE + 0xc4)
 #define RXOP_CHECK_CFG_H		(PORT_BASE + 0xfc)
 #define SAS_SSP_CON_TIMER_CFG		(PORT_BASE + 0x134)
@@ -650,6 +652,14 @@ static void enable_phy_v3_hw(struct hisi_hba *hisi_hba, int phy_no)
 	hisi_sas_phy_write32(hisi_hba, phy_no, PHY_CFG, cfg);
 }
 
+static void disable_phy_v3_hw(struct hisi_hba *hisi_hba, int phy_no)
+{
+	u32 cfg = hisi_sas_phy_read32(hisi_hba, phy_no, PHY_CFG);
+
+	cfg &= ~PHY_CFG_ENA_MSK;
+	hisi_sas_phy_write32(hisi_hba, phy_no, PHY_CFG, cfg);
+}
+
 static void start_phy_v3_hw(struct hisi_hba *hisi_hba, int phy_no)
 {
 	config_id_frame_v3_hw(hisi_hba, phy_no);
@@ -657,6 +667,11 @@ static void start_phy_v3_hw(struct hisi_hba *hisi_hba, int phy_no)
 	enable_phy_v3_hw(hisi_hba, phy_no);
 }
 
+static void stop_phy_v3_hw(struct hisi_hba *hisi_hba, int phy_no)
+{
+	disable_phy_v3_hw(hisi_hba, phy_no);
+}
+
 static void start_phys_v3_hw(struct hisi_hba *hisi_hba)
 {
 	int i;
@@ -665,6 +680,26 @@ static void start_phys_v3_hw(struct hisi_hba *hisi_hba)
 		start_phy_v3_hw(hisi_hba, i);
 }
 
+static void phy_hard_reset_v3_hw(struct hisi_hba *hisi_hba, int phy_no)
+{
+	struct hisi_sas_phy *phy = &hisi_hba->phy[phy_no];
+	u32 txid_auto;
+
+	stop_phy_v3_hw(hisi_hba, phy_no);
+	if (phy->identify.device_type == SAS_END_DEVICE) {
+		txid_auto = hisi_sas_phy_read32(hisi_hba, phy_no, TXID_AUTO);
+		hisi_sas_phy_write32(hisi_hba, phy_no, TXID_AUTO,
+					txid_auto | TX_HARDRST_MSK);
+	}
+	msleep(100);
+	start_phy_v3_hw(hisi_hba, phy_no);
+}
+
+enum sas_linkrate phy_get_max_linkrate_v3_hw(void)
+{
+	return SAS_LINK_RATE_12_0_GBPS;
+}
+
 static void phys_init_v3_hw(struct hisi_hba *hisi_hba)
 {
 	start_phys_v3_hw(hisi_hba);
@@ -2141,6 +2176,10 @@ static void hisi_sas_v3_remove(struct pci_dev *pdev)
 	.start_delivery = start_delivery_v3_hw,
 	.slot_complete = slot_complete_v3_hw,
 	.phys_init = phys_init_v3_hw,
+	.phy_enable = enable_phy_v3_hw,
+	.phy_disable = disable_phy_v3_hw,
+	.phy_hard_reset = phy_hard_reset_v3_hw,
+	.phy_get_max_linkrate = phy_get_max_linkrate_v3_hw,
 };
 
 enum {
-- 
1.9.1

  parent reply	other threads:[~2017-05-25 11:37 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-25 12:04 [PATCH v2 00/22] hisi_sas: hip08 support John Garry
2017-05-25 12:04 ` [PATCH v2 01/22] scsi: hisi_sas: fix timeout check in hisi_sas_internal_task_abort() John Garry
2017-05-25 12:04 ` [PATCH v2 02/22] scsi: hisi_sas: optimise the usage of hisi_hba.lock John Garry
2017-05-26  0:23   ` kbuild test robot
2017-05-26  8:52     ` Arnd Bergmann
2017-05-25 12:04 ` [PATCH v2 03/22] scsi: hisi_sas: relocate get_ata_protocol() John Garry
2017-05-25 12:04 ` [PATCH v2 04/22] scsi: hisi_sas: relocate sata_done_v2_hw() John Garry
2017-05-25 12:04 ` [PATCH v2 05/22] scsi: hisi_sas: relocate get_ncq_tag_v2_hw() John Garry
2017-05-25 12:04 ` [PATCH v2 06/22] scsi: hisi_sas: add pci_dev in hisi_hba struct John Garry
2017-05-25 12:04 ` [PATCH v2 07/22] scsi: hisi_sas: create hisi_sas_get_fw_info() John Garry
2017-05-29 10:53   ` Arnd Bergmann
2017-05-29 11:18     ` John Garry
2017-05-29 11:22       ` Arnd Bergmann
2017-05-25 12:04 ` [PATCH v2 08/22] scsi: hisi_sas: add skeleton v3 hw driver John Garry
2017-05-25 12:04 ` [PATCH v2 09/22] scsi: hisi_sas: add initialisation for v3 pci-based controller John Garry
2017-05-25 12:04 ` [PATCH v2 10/22] scsi: hisi_sas: add v3 hw init John Garry
2017-05-25 12:05 ` [PATCH v2 11/22] scsi: hisi_sas: add v3 hw PHY init John Garry
2017-05-25 12:05 ` [PATCH v2 12/22] scsi: hisi_sas: add phy up/down/bcast and channel ISR John Garry
2017-05-25 12:05 ` [PATCH v2 13/22] scsi: hisi_sas: add v3 cq interrupt handler John Garry
2017-05-25 12:05 ` [PATCH v2 14/22] scsi: hisi_sas: add v3 code to send SSP frame John Garry
2017-05-25 12:05 ` [PATCH v2 15/22] scsi: hisi_sas: add v3 code to send SMP frame John Garry
2017-05-25 12:05 ` [PATCH v2 16/22] scsi: hisi_sas: add v3 code to send ATA frame John Garry
2017-05-25 12:05 ` [PATCH v2 17/22] scsi: hisi_sas: add v3 code for itct setup and free John Garry
2017-05-25 12:05 ` [PATCH v2 18/22] scsi: hisi_sas: add v3 code to send internal abort command John Garry
2017-05-25 12:05 ` [PATCH v2 19/22] scsi: hisi_sas: add get_wideport_bitmap_v3_hw() John Garry
2017-05-25 12:05 ` [PATCH v2 20/22] scsi: hisi_sas: Add v3 code to support ECC and AXI bus fatal error John Garry
2017-05-25 12:05 ` John Garry [this message]
2017-05-25 12:05 ` [PATCH v2 22/22] scsi: hisi_sas: modify internal abort dev flow for v3 hw John Garry

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=1495713911-80476-22-git-send-email-john.garry@huawei.com \
    --to=john.garry@huawei.com \
    --cc=arnd@arndb.de \
    --cc=chenxiang66@hisilicon.com \
    --cc=jejb@linux.vnet.ibm.com \
    --cc=john.garry2@mail.dcu.ie \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=linuxarm@huawei.com \
    --cc=martin.petersen@oracle.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

all inboxes | Powered by JetHome®