From patchwork Mon Jun 5 07:37:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Schmitz X-Patchwork-Id: 9765657 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 32FC2602BF for ; Mon, 5 Jun 2017 07:38:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 251CF27968 for ; Mon, 5 Jun 2017 07:38:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1523527D4D; Mon, 5 Jun 2017 07:38:18 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, 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 8C9AF27CF9 for ; Mon, 5 Jun 2017 07:38:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751407AbdFEHiQ (ORCPT ); Mon, 5 Jun 2017 03:38:16 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:33125 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751321AbdFEHiP (ORCPT ); Mon, 5 Jun 2017 03:38:15 -0400 Received: by mail-pf0-f195.google.com with SMTP id f27so19806642pfe.0; Mon, 05 Jun 2017 00:38:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=hhoRmSaKjdkYNYJW1t+avvbEz+aAX8P+mjDBuGiH8gk=; b=H3Gz020RpxbC4iFSvnLDwZh9P3uFgN6KIiC5Jzj/b20conOGMZjCRTVYCBMX8C/Sih s4wnqc3cqaMogAw3zowUnErDafxDef7pmo0OIQvPdD/ulLJWzes60fWg+fhSEFBtX6K9 aYoFnW+iLVDPbSP2FOXRBHv/zxmabvEFRSPixQlrtaymtdu1xI74sEw97qeHSQa9QNBi peIrcdrpAwKqwJrf0vuU1/xVeLZ0o8+X4N6AJ+gI9Z6fbhL1xcVm/7hO8ae2Dykh6K7m P128AYlVXgNo4RSXzT0gRtjgdjiVLoHmqySM4C09/tqmhvY5xJzY/qWLXWNnaDrM93gs 9ufQ== 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; bh=hhoRmSaKjdkYNYJW1t+avvbEz+aAX8P+mjDBuGiH8gk=; b=E8MJKk/zQMt7sTcYaQEiG3kx2Sti4BbWW9fi/r6Eozns25UD4BZhF5S/BrPGxkktsr WifijGF0CLyfuUmIrADIqDGzjLv/10xxZGwG2qMntoYLjTWN52FgOACr99E8EuarJNzw Lb2Sgmuh7MBX3jbOmHlCRc+iFf4uhLvP6xgyDugaxMNkJpvzjrZQcpGiCQ3D/5TcUCNK BeiFMN6xJYc8lDMU7QVHAMq2FVjBvhOZXUDcJlNZU8/lkNfcZEF2tZNwXcmxhliE52zi bFH44PiUfbP0QUiD2iZp4SOxV8DbBxvASq2ZLqAWO7cHHGzjcduMZApc6Nw0FheLFsc8 CtxA== X-Gm-Message-State: AODbwcCQQSOK4bQjuzFHYINdCpvahkPP86O4qxS+b+VqNz+Xd/8+uvlI JQ1XloVu2DKi8A== X-Received: by 10.84.238.139 with SMTP id v11mr13920753plk.182.1496648295042; Mon, 05 Jun 2017 00:38:15 -0700 (PDT) Received: from xplor.waratah.dyndns.org (122-62-218-126.jetstream.xtra.co.nz. [122.62.218.126]) by smtp.gmail.com with ESMTPSA id z7sm40416235pgr.3.2017.06.05.00.38.13 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 05 Jun 2017 00:38:14 -0700 (PDT) Received: by xplor.waratah.dyndns.org (Postfix, from userid 1000) id 18100360081; Mon, 5 Jun 2017 19:38:10 +1200 (NZST) From: Michael Schmitz To: linux-m68k@vger.kernel.org, fthain@telegraphics.com.au Cc: geert@linux-m68k.org, cts@debian.org, linux-scsi@vger.kernel.org, Michael Schmitz Subject: [PATCH] m68k/atari: atari_scsi.c - use m68k_realnum_memory for FastRAM test Date: Mon, 5 Jun 2017 19:37:59 +1200 Message-Id: <1496648279-15702-1-git-send-email-schmitzmic@gmail.com> X-Mailer: git-send-email 1.7.0.4 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 m68k_num_memory is unsuitable to test for the presence of FastRAM on CT60 if the kernel is located in FastRAM: in arch/m68k/mm/motorola.c the ST-RAM chunk is skipped and m68k_num_memory is decremented in this case. m68k_realnum_memory still contains the actual number of RAM chunks so use that. Tested by Christian Steiges on his Falcon with kernel loaded in FastRAM - could you please reply with your Tested-by tag, Christian? Signed-off-by: Michael Schmitz Tested-by: Christian T. Steigies --- drivers/scsi/atari_scsi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c index f792420..a75feeb 100644 --- a/drivers/scsi/atari_scsi.c +++ b/drivers/scsi/atari_scsi.c @@ -776,7 +776,7 @@ static int __init atari_scsi_probe(struct platform_device *pdev) * from/to alternative Ram. */ if (ATARIHW_PRESENT(ST_SCSI) && !ATARIHW_PRESENT(EXTD_DMA) && - m68k_num_memory > 1) { + m68k_realnum_memory > 1) { atari_dma_buffer = atari_stram_alloc(STRAM_BUFFER_SIZE, "SCSI"); if (!atari_dma_buffer) { pr_err(PFX "can't allocate ST-RAM double buffer\n");