From patchwork Wed Jan 17 16:46:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 124820 Delivered-To: patch@linaro.org Received: by 10.46.62.1 with SMTP id l1csp90890lja; Wed, 17 Jan 2018 07:55:18 -0800 (PST) X-Google-Smtp-Source: ACJfBosf++OGutpP4bFiGlDHvib9Adqk+NUKsNse3rmUZt3lJKcMpUHJ0vVvFFOmoJRIyKIocpMr X-Received: by 10.159.244.3 with SMTP id x3mr43617373plr.192.1516204517975; Wed, 17 Jan 2018 07:55:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516204517; cv=none; d=google.com; s=arc-20160816; b=dU9oXeBn9lHPFo+x1nWVCGEzuEuFbUjYXGSOxpDtFYJt+uJTtUUQru2Z6JZ5eHdXRg f6Rd8yyNFqveOktEbXPyTKXxBwQXByK5TMIdLYvKy+HNH+ukDsnz8UFMB7godXW73fWs 5Vs4LN8s68K8I1aT3udti2jmyN9IDxBSWBy7+cCy2swq4xiAlAz+VZ991xzZpQhJb0IW LGvCjO0gua+kRbY49Abo1Z012Y4ZJYQDGwS1FFB6L7LZ5m/s8ycmMsF1J6crsfesM3ij nH+2lpa0AhkZxDoOtR6ZaXfY3ghDD/u+haNCMEYIWJR0kyYJMfUbANMO8uHQXUYqZk7w gMyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=sZqE0JgOSP4Jizfdf3VV3yKwIjYoW9KW31CmydfK+dw=; b=uuw1yhaC9X1rsqIKKOfBMaM0SKb08GvFPPJan7AeJ52WYDRNl/0aV+137d+LGLvB1L ZIda+gGtcT+/FJeUBE6zFtvqK92t3fGtC2s9VxDMNqI43DIrQ2VKhA67O8o/1+OYXQlV mgx2MnDRECVrsJzas+MLIIXMClOj9U22l8xG4nsseJJpOzbZpO7GmrS/vBKB/pWgeYON QHiJPTGifqTWA6uK9swZwLmQNjr90fGruNxx0CGIObeBZrbUC33twABIsNLgbcDsb/vn ommaRWaA7X5XNneAH60xryrJD88U8Id4wFQHXCTfXEOwcxuspW8cWBtvH15adPmKNzPP a1aQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u6si4541052pld.512.2018.01.17.07.55.17; Wed, 17 Jan 2018 07:55:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753793AbeAQPys (ORCPT + 28 others); Wed, 17 Jan 2018 10:54:48 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:38185 "EHLO huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753158AbeAQPyn (ORCPT ); Wed, 17 Jan 2018 10:54:43 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 7C42F7E4D1825; Wed, 17 Jan 2018 23:54:24 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.361.1; Wed, 17 Jan 2018 23:54:15 +0800 From: John Garry To: , , , CC: , , , , Xiaofei Tan , John Garry Subject: [PATCH 2/3] scsi: hisi_sas: directly attached disk LED feature for v2 hw Date: Thu, 18 Jan 2018 00:46:53 +0800 Message-ID: <1516207614-159721-3-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1516207614-159721-1-git-send-email-john.garry@huawei.com> References: <1516207614-159721-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xiaofei Tan This patch implements LED feature of directly attached disk for v2 hw. As libsas has provided an interface lldd_write_gpio() for this feature, we just need realise the interface following SPGIO API. We use an CPLD to finish the hardware part of this feature, and the base address of CPLD should be configured through ACPI or DT tables. Signed-off-by: Xiaofei Tan Signed-off-by: John Garry --- drivers/scsi/hisi_sas/hisi_sas.h | 3 +++ drivers/scsi/hisi_sas/hisi_sas_main.c | 20 +++++++++++++++++ drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 39 ++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+) -- 1.9.1 diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h index 4000de4..e7fd287 100644 --- a/drivers/scsi/hisi_sas/hisi_sas.h +++ b/drivers/scsi/hisi_sas/hisi_sas.h @@ -244,6 +244,8 @@ struct hisi_sas_hw { struct domain_device *device); int (*soft_reset)(struct hisi_hba *hisi_hba); u32 (*get_phys_state)(struct hisi_hba *hisi_hba); + int (*write_gpio)(struct hisi_hba *hisi_hba, u8 reg_type, + u8 reg_index, u8 reg_count, u8 *write_data); int max_command_entries; int complete_hdr_size; }; @@ -257,6 +259,7 @@ struct hisi_hba { struct device *dev; void __iomem *regs; + void __iomem *sgpio_regs; struct regmap *ctrl; u32 ctrl_reset_reg; u32 ctrl_reset_sts_reg; diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index e3e7285..791462d 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -1634,6 +1634,18 @@ static void hisi_sas_port_deformed(struct asd_sas_phy *sas_phy) { } +static int hisi_sas_write_gpio(struct sas_ha_struct *sha, u8 reg_type, + u8 reg_index, u8 reg_count, u8 *write_data) +{ + struct hisi_hba *hisi_hba = sha->lldd_ha; + + if (!hisi_hba->hw->write_gpio) + return -EOPNOTSUPP; + + return hisi_hba->hw->write_gpio(hisi_hba, reg_type, + reg_index, reg_count, write_data); +} + static void hisi_sas_phy_disconnected(struct hisi_sas_phy *phy) { phy->phy_attached = 0; @@ -1731,6 +1743,7 @@ void hisi_sas_kill_tasklets(struct hisi_hba *hisi_hba) .lldd_clear_nexus_ha = hisi_sas_clear_nexus_ha, .lldd_port_formed = hisi_sas_port_formed, .lldd_port_deformed = hisi_sas_port_deformed, + .lldd_write_gpio = hisi_sas_write_gpio, }; void hisi_sas_init_mem(struct hisi_hba *hisi_hba) @@ -2055,6 +2068,13 @@ static struct Scsi_Host *hisi_sas_shost_alloc(struct platform_device *pdev, if (IS_ERR(hisi_hba->regs)) goto err_out; + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + if (res) { + hisi_hba->sgpio_regs = devm_ioremap_resource(dev, res); + if (IS_ERR(hisi_hba->sgpio_regs)) + goto err_out; + } + if (hisi_sas_alloc(hisi_hba, shost)) { hisi_sas_free(hisi_hba); goto err_out; diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c index ebee2e4..4ccb61e 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c @@ -3474,6 +3474,44 @@ static int soft_reset_v2_hw(struct hisi_hba *hisi_hba) return 0; } +static int write_gpio_v2_hw(struct hisi_hba *hisi_hba, u8 reg_type, + u8 reg_index, u8 reg_count, u8 *write_data) +{ + struct device *dev = hisi_hba->dev; + int phy_no, count; + + if (!hisi_hba->sgpio_regs) + return -EOPNOTSUPP; + + switch (reg_type) { + case SAS_GPIO_REG_TX: + count = reg_count * 4; + count = min(count, hisi_hba->n_phy); + + for (phy_no = 0; phy_no < count; phy_no++) { + /* + * GPIO_TX[n] register has the highest numbered drive + * of the four in the first byte and the lowest + * numbered drive in the fourth byte. + * See SFF-8485 Rev. 0.7 Table 24. + */ + void __iomem *reg_addr = hisi_hba->sgpio_regs + + reg_index * 4 + phy_no; + int data_idx = phy_no + 3 - (phy_no % 4) * 2; + + writeb(write_data[data_idx], reg_addr); + } + + break; + default: + dev_err(dev, "write gpio: unsupported or bad reg type %d\n", + reg_type); + return -EINVAL; + } + + return 0; +} + static const struct hisi_sas_hw hisi_sas_v2_hw = { .hw_init = hisi_sas_v2_init, .setup_itct = setup_itct_v2_hw, @@ -3501,6 +3539,7 @@ static int soft_reset_v2_hw(struct hisi_hba *hisi_hba) .complete_hdr_size = sizeof(struct hisi_sas_complete_v2_hdr), .soft_reset = soft_reset_v2_hw, .get_phys_state = get_phys_state_v2_hw, + .write_gpio = write_gpio_v2_hw, }; static int hisi_sas_v2_probe(struct platform_device *pdev) From patchwork Wed Jan 17 16:46:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 124818 Delivered-To: patch@linaro.org Received: by 10.46.62.1 with SMTP id l1csp90764lja; Wed, 17 Jan 2018 07:54:51 -0800 (PST) X-Google-Smtp-Source: ACJfBovWpjZ3QDOHbupb0/4IUYzmLi1YHCwv9WRwHpX4Zw3sdm4uSr7ahmJH53bVa0FEf2ws9/J2 X-Received: by 10.98.10.79 with SMTP id s76mr25573221pfi.63.1516204491232; Wed, 17 Jan 2018 07:54:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516204491; cv=none; d=google.com; s=arc-20160816; b=Gmzmox5y3il8Rz2q21ZlHuwxBo5aof2avRHMMe6ZKioEzVw6X96JI2cuJo8hBpWA6r UCeWA6QCjnd5uCY0tnL6ZHdjtbJn9+cmvAo0++vCxqwU0IEmoTm8DfUTIqhE4KgbG1Pl 6K9LyDTbtYF5nP/bJ1Nj1wIeTlwuEdi3o79nav3xoSp8Z+CrHXvtkoty+NW0sKRsKtkI lVUljBZ3j64+VvXsT0F5YUqTRCf+NrEk7lVpkP0EG3QuYM3+zyjxYnzIZ7ZlHKE9NiCH hskClSKy7kIKsJLeq3YnuYbt8KzCASPlDKIi09zfsLy41sSWvtflRWGvAl6SZ4daIHtM HV1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=oaj4+LChqO9clOIZP87mBOk/gacnd/qDkcViQ3bGSrY=; b=DfP1fQF6bFBzSsEAc+4TUDU1U7P3VU7eoCnfCpsHLzWw9YHbJk3xCwokgQzshe7/jB g3LBvi16F+mFnSEvqsq8HrI/tPII9bJafpuYWpjezvZns+u8N30LXbWPmaV+is44DHQ5 sSkU1/LC2U3y6ZXkCHpTIR6UPMQVh/5AF6iWIImB8K54fbGl17Augu88LnM+rc4AJUo1 x2lhTaJmKPWwBVJkKg3ePhjwNOpOOod+iDlEpXuCr2XvVMuLqgY2bEE9U083QgjFBRhU oqb/18z1FlyIZlT+xtov66aiEWBn8AZ6eQM5mm9UG9AQX/tS14LF24nHfjdqkHUgKxSr S+Bg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w6si4022204pgq.273.2018.01.17.07.54.50; Wed, 17 Jan 2018 07:54:51 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753833AbeAQPyt (ORCPT + 28 others); Wed, 17 Jan 2018 10:54:49 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:38187 "EHLO huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753690AbeAQPyn (ORCPT ); Wed, 17 Jan 2018 10:54:43 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 5D24CBB636B8B; Wed, 17 Jan 2018 23:54:24 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.361.1; Wed, 17 Jan 2018 23:54:16 +0800 From: John Garry To: , , , CC: , , , , Xiang Chen , John Garry Subject: [PATCH 3/3] scsi: hisi_sas: fix a bug in hisi_sas_dev_gone() Date: Thu, 18 Jan 2018 00:46:54 +0800 Message-ID: <1516207614-159721-4-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1516207614-159721-1-git-send-email-john.garry@huawei.com> References: <1516207614-159721-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xiang Chen When device gone, NULL pointer can be accessed in free_device callback if during SAS controller reset as we clear structure sas_dev prior. Actually we can only set dev_type as SAS_PHY_UNUSED and not clear structure sas_dev as all the members of structure sas_dev will be re-initialized after device found. Signed-off-by: Xiang Chen Signed-off-by: John Garry --- drivers/scsi/hisi_sas/hisi_sas_main.c | 1 - 1 file changed, 1 deletion(-) -- 1.9.1 diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 791462d..2d4dbed 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -796,7 +796,6 @@ static void hisi_sas_dev_gone(struct domain_device *device) hisi_hba->hw->clear_itct(hisi_hba, sas_dev); device->lldd_dev = NULL; - memset(sas_dev, 0, sizeof(*sas_dev)); } if (hisi_hba->hw->free_device)