From patchwork Tue Apr 24 09:28:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitra P B X-Patchwork-Id: 10359077 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 E895460547 for ; Tue, 24 Apr 2018 09:29:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC13828D04 for ; Tue, 24 Apr 2018 09:29:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0F6228D3B; Tue, 24 Apr 2018 09:29:21 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham 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 711DA28D04 for ; Tue, 24 Apr 2018 09:29:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753748AbeDXJ3U (ORCPT ); Tue, 24 Apr 2018 05:29:20 -0400 Received: from mail-qt0-f196.google.com ([209.85.216.196]:41411 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753553AbeDXJ3Q (ORCPT ); Tue, 24 Apr 2018 05:29:16 -0400 Received: by mail-qt0-f196.google.com with SMTP id d3-v6so21106966qth.8 for ; Tue, 24 Apr 2018 02:29:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EVjZcrwGp1MRh19gzFAHtFTvkQRNBZm0xwIvQ2tvFY0=; b=cElo/1iNVaQu4v2+rgHvWvsFC9xpadyBvvmmaQ2V67hS+ebwuqOcaajHWDpK0K9ioJ 4Fic+pIdifMia3ts6YnDHahB/WbDoygXjBb5bovR+Vor/E1g32xF6LL9UXF2zddzftEz hMJi2q+MkOipwFy2YkjM4Hx07uUyE5Cq1kfgQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EVjZcrwGp1MRh19gzFAHtFTvkQRNBZm0xwIvQ2tvFY0=; b=IkJ/Czdgnt8ZVUEcJXmayZFZ4meRS/mhnByyctL9rlz/UEy390VLmUeQwRYsTUwVCL MHGRQv8/ozSG7Szs49oWOvU7tp+VnMYw3NunSCJWkBuo7YPNTDfPy6DPjWW9SkozASCb N3VQSt5+iEGqVVjl9JbYYO5UbTEYphDQGy3d386w3ksdCR7rL3SpZfdWFjqJEPxlVXvJ MYENDI+438h6S939NnJN2yEuR228FghJ2KyoPepCDJUZvrOjVq39tgNuiFtDcFmYQjZV 680Hy/FTuqvQtcxoNdWFAleH1XUS4+Vekqa0S5d6eN+OilSt2k2jsvrXApplQZQWbZAg MrlQ== X-Gm-Message-State: ALQs6tDr8Jz5eIhs6VfAhujLWvR2TxT8ek3Vl//lo7OmjRchQFA5wciL sBS/GrbhK6JRADPgOf6Qlw+X0PheVt0= X-Google-Smtp-Source: AB8JxZqX75AhPe7i8myyD6I8AlL3iG1wgHm2KNciZrZY8T0a9oNE/B8tkqLgtpf4qiLJ8QP93Gbtcg== X-Received: by 2002:aed:3704:: with SMTP id i4-v6mr16489245qtb.234.1524562155351; Tue, 24 Apr 2018 02:29:15 -0700 (PDT) Received: from localhost.localdomain.localdomain ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id 96sm12615184qkx.71.2018.04.24.02.29.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 02:29:14 -0700 (PDT) From: Chaitra P B To: linux-scsi@vger.kernel.org Cc: Sathya.Prakash@broadcom.com, sreekanth.reddy@broadcom.com, suganath-prabu.subramani@broadcom.com, Chaitra P B Subject: [PATCH v3 05/14] mpt3sas: Enhanced handling of Sense Buffer. Date: Tue, 24 Apr 2018 05:28:34 -0400 Message-Id: <1524562123-33229-6-git-send-email-chaitra.basappa@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1524562123-33229-1-git-send-email-chaitra.basappa@broadcom.com> References: <1524562123-33229-1-git-send-email-chaitra.basappa@broadcom.com> 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 Enhanced DMA allocation for Sense Buffer, if the allocation does not fit within same 4GB.Introduced is_MSB_are_same function to check if allocted buffer within 4GB range or not. Signed-off-by: Chaitra P B Signed-off-by: Suganath Prabu S --- drivers/scsi/mpt3sas/mpt3sas_base.c | 56 +++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index 415e7f0..0b44ff7 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -4205,6 +4205,31 @@ _base_release_memory_pools(struct MPT3SAS_ADAPTER *ioc) } /** + * is_MSB_are_same - checks whether all reply queues in a set are + * having same upper 32bits in their base memory address. + * @reply_pool_start_address: Base address of a reply queue set + * @pool_sz: Size of single Reply Descriptor Post Queues pool size + * + * Returns 1 if reply queues in a set have a same upper 32bits + * in their base memory address, + * else 0 + */ + +static int +is_MSB_are_same(long reply_pool_start_address, u32 pool_sz) +{ + long reply_pool_end_address; + + reply_pool_end_address = reply_pool_start_address + pool_sz; + + if (upper_32_bits(reply_pool_start_address) == + upper_32_bits(reply_pool_end_address)) + return 1; + else + return 0; +} + +/** * _base_allocate_memory_pools - allocate start of day memory pools * @ioc: per adapter object * @@ -4664,6 +4689,37 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) ioc->name); goto out; } + /* sense buffer requires to be in same 4 gb region. + * Below function will check the same. + * In case of failure, new pci pool will be created with updated + * alignment. Older allocation and pool will be destroyed. + * Alignment will be used such a way that next allocation if + * success, will always meet same 4gb region requirement. + * Actual requirement is not alignment, but we need start and end of + * DMA address must have same upper 32 bit address. + */ + if (!is_MSB_are_same((long)ioc->sense, sz)) { + //Release Sense pool & Reallocate + dma_pool_free(ioc->sense_dma_pool, ioc->sense, ioc->sense_dma); + dma_pool_destroy(ioc->sense_dma_pool); + ioc->sense = NULL; + + ioc->sense_dma_pool = + dma_pool_create("sense pool", &ioc->pdev->dev, sz, + roundup_pow_of_two(sz), 0); + if (!ioc->sense_dma_pool) { + pr_err(MPT3SAS_FMT "sense pool: pci_pool_create failed\n", + ioc->name); + goto out; + } + ioc->sense = dma_pool_alloc(ioc->sense_dma_pool, GFP_KERNEL, + &ioc->sense_dma); + if (!ioc->sense) { + pr_err(MPT3SAS_FMT "sense pool: pci_pool_alloc failed\n", + ioc->name); + goto out; + } + } dinitprintk(ioc, pr_info(MPT3SAS_FMT "sense pool(0x%p): depth(%d), element_size(%d), pool_size" "(%d kB)\n", ioc->name, ioc->sense, ioc->scsiio_depth,