From patchwork Fri Jun 3 12:03:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Chiou X-Patchwork-Id: 9152957 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C6D176072B for ; Fri, 3 Jun 2016 12:04:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B73A21FEBD for ; Fri, 3 Jun 2016 12:04:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA22B28309; Fri, 3 Jun 2016 12:04:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 353411FEBD for ; Fri, 3 Jun 2016 12:04:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752695AbcFCMEG (ORCPT ); Fri, 3 Jun 2016 08:04:06 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35000 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751749AbcFCMEF (ORCPT ); Fri, 3 Jun 2016 08:04:05 -0400 Received: by mail-pf0-f196.google.com with SMTP id f144so11433957pfa.2; Fri, 03 Jun 2016 05:04:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=KclOcAgcUlcRJGxb845UUz+6nfm+H8CEmUeYurpAhIs=; b=QKrzoJRA+gDajPCLT1plHCHrF9qthStuLWq46oFKBWRCYWLsRWVvJhu02146Kq2ozW LWV//b4M9vj/bvH/avH5HaYMS+5WqXZDwL0tQUa7dk6wfq0zPGSeu0x7WrP2tkxCiuNL VRqZo+S7V+9I01c3zL3CdJ2RQIV0O8UC0/jJLkOa/JNogBClhKR9aEs3Ln90LXxadsfw OoJVHbftgQ2uFEzP/17lHMZKma/8EoZQY0r49HZLi9xb9euupCVkCG2JcXpXqkq6enWS LovpUVXo4v5AFgKSntwhemEYVhkcwQ21gBb6Al+GjVox4XY4MhGCEHrYMIWKQSWhjqvD BjZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KclOcAgcUlcRJGxb845UUz+6nfm+H8CEmUeYurpAhIs=; b=brl3voUkA+agPCCbumso6HC+wd0qQgrxlYPqlUcmBfxOEwh7m4WgbvV4wxPxwluXTb /8IDOFxt35/ScNbM4egVj/GwrV0ucxHlTkblvlg5oSFNIzRZj8taI77VQ8PDjztTiRVJ 16+zQ1+KivIPwpwPk5GdBb6kQXMtLK17dMazNY3A1Y5S3iaTPO7ulNCN9Fg5CmfNGLkf nCir8SQBTWQpLd55CyQ3eZUarwfHAGLYbvijgIzKvJTqxdZK7tZFiVXCP+7xpOMGwNfB FwpU9GJ1sk+gW4HJj/XvBp+RmUSUWCEZJ5cjAmyEOsKUhHFKqQtEL4oS6618k0pMiGeh u9SA== X-Gm-Message-State: ALyK8tKza8SxAEvROUX+nXlworUYrcRVjSFfLAGnqMjcet3cKtJ4cQyVswSdhctUq8dopQ== X-Received: by 10.98.54.133 with SMTP id d127mr5819134pfa.104.1464955443294; Fri, 03 Jun 2016 05:04:03 -0700 (PDT) Received: from charles-desktop.promise.com.tw (vpn.promise.com.tw. [61.222.81.253]) by smtp.gmail.com with ESMTPSA id lq8sm5571424pab.40.2016.06.03.05.04.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 03 Jun 2016 05:04:02 -0700 (PDT) From: Charles Chiou To: jejb@linux.vnet.ibm.com, martin.petersen@oracle.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Charles Subject: [v2 PATCH 1/3] scsi:stex.c Support to Pegasus series. Date: Fri, 3 Jun 2016 20:03:58 +0800 Message-Id: <1464955438-16568-1-git-send-email-ch1102chiou@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Charles Pegasus is a high performace hardware RAID solution designed to unleash the raw power of Thunderbolt technology. 1. Add code to distinct SuperTrack and Pegasus series by sub device ID. It should support backward compatibility. 2. Change the driver version. Signed-off-by: Charles Chiou Reviewed-by: Johannes Thumshirn --- drivers/scsi/stex.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c index 2de28d7..495d632 100644 --- a/drivers/scsi/stex.c +++ b/drivers/scsi/stex.c @@ -1,7 +1,7 @@ /* * SuperTrak EX Series Storage Controller driver for Linux * - * Copyright (C) 2005-2009 Promise Technology Inc. + * Copyright (C) 2005-2015 Promise Technology Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -38,11 +38,11 @@ #include #define DRV_NAME "stex" -#define ST_DRIVER_VERSION "4.6.0000.4" -#define ST_VER_MAJOR 4 -#define ST_VER_MINOR 6 -#define ST_OEM 0 -#define ST_BUILD_VER 4 +#define ST_DRIVER_VERSION "5.00.0000.01" +#define ST_VER_MAJOR 5 +#define ST_VER_MINOR 00 +#define ST_OEM 0000 +#define ST_BUILD_VER 01 enum { /* MU register offset */ @@ -328,6 +328,7 @@ struct st_hba { u16 rq_count; u16 rq_size; u16 sts_count; + u8 supports_pm; }; struct st_card_info { @@ -1560,6 +1561,25 @@ static int stex_probe(struct pci_dev *pdev, const struct pci_device_id *id) hba->cardtype = (unsigned int) id->driver_data; ci = &stex_card_info[hba->cardtype]; + switch (id->subdevice) { + case 0x4221: + case 0x4222: + case 0x4223: + case 0x4224: + case 0x4225: + case 0x4226: + case 0x4227: + case 0x4261: + case 0x4262: + case 0x4263: + case 0x4264: + case 0x4265: + break; + default: + if (hba->cardtype == st_yel) + hba->supports_pm = 1; + } + sts_offset = scratch_offset = (ci->rq_count+1) * ci->rq_size; if (hba->cardtype == st_yel) sts_offset += (ci->sts_count+1) * sizeof(u32);