From patchwork Tue Jan 29 17:07:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 1032909 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ptHL5KFPz9sML; Wed, 30 Jan 2019 04:08:14 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1goWrn-0004LB-8Q; Tue, 29 Jan 2019 17:08:07 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1goWrl-0004L0-DN for kernel-team@lists.ubuntu.com; Tue, 29 Jan 2019 17:08:05 +0000 Received: from mail-qt1-f200.google.com ([209.85.160.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1goWrl-0004XZ-3u for kernel-team@lists.ubuntu.com; Tue, 29 Jan 2019 17:08:05 +0000 Received: by mail-qt1-f200.google.com with SMTP id p24so25509333qtl.2 for ; Tue, 29 Jan 2019 09:08:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=RRIvM1nokx3cFOoglMAQQh5wWxUp/8EInACLoEgLTlU=; b=Cg190JhPAAF7bkKQjI7BIy6nhGCVMWvSQXbJRFbzFybU6P5tziK9KhqNts3DeV54ee WT1SphrSWerBIsdHvPtUq9DDcd5ltBFLyaDhDmVXc2Ga5lS0ZcvuGCeG/5V2KJZ304r1 jwyU/iAgKNW1An7i57auLUIIvN+aVtebG8ALo3xb4pzcAsqW29YzaAvCktCPLApWXmf7 +uJT+/vlUUVmP10kbNXZ+bgT7GYebvGCQhotLjDFzZ8kUxOdpNeUybL4UOVCyHAVmArn GPrzeZhGLc3bPPWBNqZ/P0UrcqKoESEYL/yTu7PxnuF4HCLonK/plAdzLb449DuC5IYF thSA== X-Gm-Message-State: AJcUuke7l5diwab06KgWj/LZ4NwK4JsdhRA/c/kgf8l/LEA13m3fld+6 SZ1+dx0En3cUncXRW0/frzdCyOKglf5dica+AmJ7twlgJQP3aUAHIULMKy392DOBl1ibD9QvHFe Ngj59rPHyb5DHHE494lReRBmGNyIhGF6oCgHaHBn8 X-Received: by 2002:aed:242e:: with SMTP id r43mr27097818qtc.128.1548781683849; Tue, 29 Jan 2019 09:08:03 -0800 (PST) X-Google-Smtp-Source: ALg8bN5NyEoN3TLXLDugfkH1+3R0A0Rdj47OWfPmyIZkRSJW4e7nBfkahEFmjMZP6FLdFT3LZfiFyQ== X-Received: by 2002:aed:242e:: with SMTP id r43mr27097776qtc.128.1548781683330; Tue, 29 Jan 2019 09:08:03 -0800 (PST) Received: from gallifrey.lan ([189.61.208.219]) by smtp.gmail.com with ESMTPSA id g19sm44519967qke.2.2019.01.29.09.08.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Jan 2019 09:08:02 -0800 (PST) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [cosmic, bionic][PATCH] scsi: megaraid_sas: Use 63-bit DMA addressing Date: Tue, 29 Jan 2019 15:07:59 -0200 Message-Id: <20190129170759.15118-1-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Shivasharan S BugLink: http://bugs.launchpad.net/bugs/1795453 Although MegaRAID controllers support 64-bit DMA addressing, as per hardware design, DMA address with all 64-bits set (0xFFFFFFFF-FFFFFFFF) results in a firmware fault. Driver will set 63-bit DMA mask to ensure the above address will not be used. Cc: stable@vger.kernel.org Signed-off-by: Shivasharan S Signed-off-by: Martin K. Petersen (cherry picked from commit 894169db12463cea08d0e2a9e35f42b291340e5a) [mhcerri: fixed context] Signed-off-by: Marcelo Henrique Cerri Conflicts: drivers/scsi/megaraid/megaraid_sas_base.c Acked-by: Colin Ian King Acked-by: Khalid Elmously --- drivers/scsi/megaraid/megaraid_sas_base.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 2d6f6414a2a2..7b1a92dd844f 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -6000,13 +6000,13 @@ static int megasas_io_attach(struct megasas_instance *instance) * @instance: Adapter soft state * Description: * - * For Ventura, driver/FW will operate in 64bit DMA addresses. + * For Ventura, driver/FW will operate in 63bit DMA addresses. * * For invader- * By default, driver/FW will operate in 32bit DMA addresses * for consistent DMA mapping but if 32 bit consistent - * DMA mask fails, driver will try with 64 bit consistent - * mask provided FW is true 64bit DMA capable + * DMA mask fails, driver will try with 63 bit consistent + * mask provided FW is true 63bit DMA capable * * For older controllers(Thunderbolt and MFI based adapters)- * driver/FW will operate in 32 bit consistent DMA addresses. @@ -6020,14 +6020,14 @@ megasas_set_dma_mask(struct megasas_instance *instance) pdev = instance->pdev; consistent_mask = (instance->adapter_type == VENTURA_SERIES) ? - DMA_BIT_MASK(64) : DMA_BIT_MASK(32); + DMA_BIT_MASK(63) : DMA_BIT_MASK(32); if (IS_DMA64) { - if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) && + if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(63)) && dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32))) goto fail_set_dma_mask; - if ((*pdev->dev.dma_mask == DMA_BIT_MASK(64)) && + if ((*pdev->dev.dma_mask == DMA_BIT_MASK(63)) && (dma_set_coherent_mask(&pdev->dev, consistent_mask) && dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))) { /* @@ -6040,7 +6040,7 @@ megasas_set_dma_mask(struct megasas_instance *instance) if (!(scratch_pad_2 & MR_CAN_HANDLE_64_BIT_DMA_OFFSET)) goto fail_set_dma_mask; else if (dma_set_mask_and_coherent(&pdev->dev, - DMA_BIT_MASK(64))) + DMA_BIT_MASK(63))) goto fail_set_dma_mask; } } else if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32))) @@ -6052,8 +6052,8 @@ megasas_set_dma_mask(struct megasas_instance *instance) instance->consistent_mask_64bit = true; dev_info(&pdev->dev, "%s bit DMA mask and %s bit consistent mask\n", - ((*pdev->dev.dma_mask == DMA_BIT_MASK(64)) ? "64" : "32"), - (instance->consistent_mask_64bit ? "64" : "32")); + ((*pdev->dev.dma_mask == DMA_BIT_MASK(64)) ? "63" : "32"), + (instance->consistent_mask_64bit ? "63" : "32")); return 0;