From patchwork Wed Jun 24 05:41:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mahesh Rajashekhara X-Patchwork-Id: 6665701 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EE635C05AC for ; Wed, 24 Jun 2015 05:41:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 00A0820616 for ; Wed, 24 Jun 2015 05:41:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D7D7E20376 for ; Wed, 24 Jun 2015 05:41:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750953AbbFXFlL (ORCPT ); Wed, 24 Jun 2015 01:41:11 -0400 Received: from bby1mta03.pmc-sierra.com ([216.241.235.118]:59772 "EHLO bby1mta03.pmc-sierra.bc.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750736AbbFXFlK convert rfc822-to-8bit (ORCPT ); Wed, 24 Jun 2015 01:41:10 -0400 Received: from bby1mta03.pmc-sierra.bc.ca (localhost.pmc-sierra.bc.ca [127.0.0.1]) by localhost (Postfix) with SMTP id D02491070511; Tue, 23 Jun 2015 22:41:09 -0700 (PDT) Received: from smtp.pmcs.com (bby1cas01.pmc-sierra.internal [216.241.227.142]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by bby1mta03.pmc-sierra.bc.ca (Postfix) with ESMTP id AD386107044F; Tue, 23 Jun 2015 22:41:09 -0700 (PDT) Received: from BBYEXM01.pmc-sierra.internal ([169.254.1.160]) by bby1cas01.pmc-sierra.internal ([2002:d8f1:e38e::d8f1:e38e]) with mapi id 14.03.0123.003; Tue, 23 Jun 2015 22:41:09 -0700 From: Mahesh Rajashekhara To: Rajinikanth Pandurangan , "jbottomley@parallels.com" , "linux-scsi@vger.kernel.org" CC: "aacraid@pmc-sierra.com" , Harry Yang , Rich Bono , Achim Leubner , Murthy Bhat Subject: RE: [Patch V2 4/9] [SCSI] aacraid: Enable 64-bit write to controller register Thread-Topic: [Patch V2 4/9] [SCSI] aacraid: Enable 64-bit write to controller register Thread-Index: AQHQo+gAC0Xuze6GekCfpCVx27dITJ27OOVA Date: Wed, 24 Jun 2015 05:41:08 +0000 Message-ID: References: <1433986951-9033-1-git-send-email-rajinikanth.pandurangan@pmcs.com> <1433986951-9033-6-git-send-email-rajinikanth.pandurangan@pmcs.com> In-Reply-To: <1433986951-9033-6-git-send-email-rajinikanth.pandurangan@pmcs.com> Accept-Language: en-CA, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [216.241.227.4] MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pmcs.com; h=from:to:cc:subject:date:message-id:references:in-reply-to:content-type:content-transfer-encoding:mime-version; s=default; bh=oAap8MFRrsQ8hjPrJHyFZC2tpBLs18iJXDugSWB6rZ0=; b=uDdgAQ0XXsdMB9nJojbdIPqVOVYkMqXqcey/3W77KRWn/2pJ8A7knB6TKm2V77jtjVlq15CIPSRShDXoiJZLhyg8dpTqiV/r4WmH2jCYy5uP/TcbFsDIdQlVX04wMrA4XCnv5wDwvQ+XwPGx5N64GoLCvGuNuHSndFWhejJOLVM= Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Reviewed-by: Mahesh Rajashekhara -----Original Message----- From: Rajinikanth Pandurangan Sent: Thursday, June 11, 2015 7:12 AM To: jbottomley@parallels.com; linux-scsi@vger.kernel.org Cc: aacraid@pmc-sierra.com; Harry Yang; Mahesh Rajashekhara; Rich Bono; Achim Leubner; Murthy Bhat; Rajinikanth Pandurangan Subject: [Patch V2 4/9] [SCSI] aacraid: Enable 64-bit write to controller register From: Rajinikanth Pandurangan Description: If writeq() not supported, then do atomic two 32bit write Signed-off-by: Rajinikanth Pandurangan --- drivers/scsi/aacraid/aacraid.h | 9 +++++++++ drivers/scsi/aacraid/comminit.c | 1 + drivers/scsi/aacraid/src.c | 12 ++++++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index 62b0999..e54f597 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h @@ -844,6 +844,10 @@ struct src_registers { &((AEP)->regs.src.bar0->CSR)) #define src_writel(AEP, CSR, value) writel(value, \ &((AEP)->regs.src.bar0->CSR)) +#if defined(writeq) +#define src_writeq(AEP, CSR, value) writeq(value, \ + &((AEP)->regs.src.bar0->CSR)) +#endif #define SRC_ODR_SHIFT 12 #define SRC_IDR_SHIFT 9 @@ -1163,6 +1167,11 @@ struct aac_dev struct fsa_dev_info *fsa_dev; struct task_struct *thread; int cardtype; + /* + *This lock will protect the two 32-bit + *writes to the Inbound Queue + */ + spinlock_t iq_lock; /* * The following is the device specific extension. diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c index e0a76d5..e4ff47e 100644 --- a/drivers/scsi/aacraid/comminit.c +++ b/drivers/scsi/aacraid/comminit.c @@ -424,6 +424,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev) dev->management_fib_count = 0; spin_lock_init(&dev->manage_lock); spin_lock_init(&dev->sync_lock); + spin_lock_init(&dev->iq_lock); dev->max_fib_size = sizeof(struct hw_fib); dev->sg_tablesize = host->sg_tablesize = (dev->max_fib_size - sizeof(struct aac_fibhdr) diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c index eb07b3d..1409a0b 100644 --- a/drivers/scsi/aacraid/src.c +++ b/drivers/scsi/aacraid/src.c @@ -447,6 +447,10 @@ static int aac_src_deliver_message(struct fib *fib) u32 fibsize; dma_addr_t address; struct aac_fib_xporthdr *pFibX; +#if !defined(writeq) + unsigned long flags; +#endif + u16 hdr_size = le16_to_cpu(fib->hw_fib_va->header.Size); atomic_inc(&q->numpending); @@ -511,10 +515,14 @@ static int aac_src_deliver_message(struct fib *fib) return -EINVAL; address |= fibsize; } - +#if defined(writeq) + src_writeq(dev, MUnit.IQ_L, (u64)address); #else + spin_lock_irqsave(&fib->dev->iq_lock, flags); src_writel(dev, MUnit.IQ_H, upper_32_bits(address) & 0xffffffff); src_writel(dev, MUnit.IQ_L, address & 0xffffffff); - + spin_unlock_irqrestore(&fib->dev->iq_lock, flags); #endif return 0; } -- 1.9.3