From patchwork Tue Jul 16 20:39:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 11046709 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 02981746 for ; Tue, 16 Jul 2019 20:39:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D1327286D0 for ; Tue, 16 Jul 2019 20:39:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C39A8286DD; Tue, 16 Jul 2019 20:39:19 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 6A091286D0 for ; Tue, 16 Jul 2019 20:39:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728579AbfGPUjT (ORCPT ); Tue, 16 Jul 2019 16:39:19 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:41564 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728535AbfGPUjS (ORCPT ); Tue, 16 Jul 2019 16:39:18 -0400 Received: by mail-lf1-f66.google.com with SMTP id 62so9831966lfa.8 for ; Tue, 16 Jul 2019 13:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=subject:from:to:cc:references:organization:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=1I8BBVYP4z5kRtg5ZU3DNAndzPRXZ8ecvy+2YxVMXl0=; b=wc1aKrrecdRmamoAaB3F5MGaRRnCa5uK0q63C3rWWKn14N8LRSfBjDuifb8rbd5gAZ e6oCgHKooyYoqiqnBq9Q3+rOjGFmwKK7R8ZUwvYYzZDWb/gnYKTlLuawYA/B29iDNfF+ 4ag5+Or5ryApepqqboq0NrCwVbRne6kp3CZjXxtQXA0uvi/M8j4on76dGd4IVAOCso0N IVKTIDSuvfFswMTjfKxQPtt4cgWEnqObEZ0fiO9Wv2cU3FNF5S/XlWaAjSh3YJTqJ92s lDjXf38Rqfjwa3tNkBBqYZXZ6CAQSaCMNxsEPj9/8t/CL55mM54bFWoiXjr1oPRjn5Sh ffZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=1I8BBVYP4z5kRtg5ZU3DNAndzPRXZ8ecvy+2YxVMXl0=; b=HfhCSV9OX/z2M5rox/3F5JFHt4Ha+AxIRxReTY3rW7fyCE/lwgv7heDInDRVo9k89u 238y1Y1G8NNmZp0+2nbWuVrJG6SFwGFkzL1EedxLt1yMTa/BwO8xDwOwdQfmp2U+MXYv sqSiRCQ3X5DriZHWyEflaibQiBMYqQFWgsEjcw3VoEoi2K3nBNjK+DQDxSQTDOaKge13 zt2E6+a6jF9WqPhfy6FuIDvnFUWz/PmkuLbPCZKnqJhMaaSyUFcFjpbeA1QLTAtKuOmr XeuRbNKPKa1U/YHoQw/7X2G1Dw3H3293qx/z7qdVRMUWMKY0f69jKAMue1WNwUUjsgrD WhfQ== X-Gm-Message-State: APjAAAV3rCYokRlnE/a2KQbKN3JjGR7uUUloF9tGHmwwdEraudP7Y3BK Ix4Fch4MIxYYHuvnF9+feU9e1A== X-Google-Smtp-Source: APXvYqzs18SbEbp+glEPSiSVNJ5IrZ9vZvC1nTacWNWCrfkx8/qA/K1Dn2i5EnS1Z6hZBh7WqPnaLQ== X-Received: by 2002:ac2:52b7:: with SMTP id r23mr15973287lfm.120.1563309556948; Tue, 16 Jul 2019 13:39:16 -0700 (PDT) Received: from wasted.cogentembedded.com ([2a00:1fa0:48ac:efbd:ce47:8248:9f54:efe4]) by smtp.gmail.com with ESMTPSA id u15sm3960826lje.89.2019.07.16.13.39.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 13:39:16 -0700 (PDT) Subject: [PATCH 1/3] scsi: fdomain: use BCTL_RST in fdomain_reset() From: Sergei Shtylyov To: "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org Cc: Ondrej Zary References: Organization: Cogent Embedded Message-ID: <2ca011ad-ece2-6481-c122-9426c4a3aa73@cogentembedded.com> Date: Tue, 16 Jul 2019 23:39:15 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-MW 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 Commit 1697c6a64c49 ("scsi: fdomain: Add register definitions") somehow missed the use of BCTL_RST in fdomain_reset(), leaving the magic number intact. Fix this issue (with no change in the generated object file). Fixes: 1697c6a64c49 ("scsi: fdomain: Add register definitions") Signed-off-by: Sergei Shtylyov --- drivers/scsi/fdomain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux/drivers/scsi/fdomain.c =================================================================== --- linux.orig/drivers/scsi/fdomain.c +++ linux/drivers/scsi/fdomain.c @@ -166,7 +166,7 @@ static int fdomain_test_loopback(int bas static void fdomain_reset(int base) { - outb(1, base + REG_BCTL); + outb(BCTL_RST, base + REG_BCTL); mdelay(20); outb(0, base + REG_BCTL); mdelay(1150); From patchwork Tue Jul 16 20:40:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 11046711 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2268E6C5 for ; Tue, 16 Jul 2019 20:40:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 105DD285F9 for ; Tue, 16 Jul 2019 20:40:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0449028620; Tue, 16 Jul 2019 20:40:52 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 9330A2860C for ; Tue, 16 Jul 2019 20:40:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728781AbfGPUkv (ORCPT ); Tue, 16 Jul 2019 16:40:51 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:45985 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728340AbfGPUkv (ORCPT ); Tue, 16 Jul 2019 16:40:51 -0400 Received: by mail-lj1-f195.google.com with SMTP id m23so21277317lje.12 for ; Tue, 16 Jul 2019 13:40:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=subject:from:to:cc:references:organization:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=OxpPquHr4zZ44hJo3tsqte//uLORrZw/8MCDX1QIshk=; b=12IiRro//mqtEOeNWSz5X++T0KfW0DhDW/VR+cr0c+1guGTs0eToZ7ea/nrPk/qsmB H5tzkolQlNEDSl9mHqc2KW/6Gi8VFy4tZyc/rJtXqBuCdaFv+IBxnglMvowCdmJKMMiz g2WbqJoIyocjTiLFKSSYEdjBMcUKf2cgT34sBbelzW2RiepsaQVxAIicQPCjKS2wXYFt emTeOnzjzFGoWzkqAVwq7TQudTUb+5SoVdvSOUqV6a402RD3+Uf3nhAutoh2Oy9+qOSW gbbaVeVJ6XxL+q1m7gwu7t/kqXV2cDkK7Wx25davsbisaPbPnLFsdYJvEtzF3khSbx7X f5XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=OxpPquHr4zZ44hJo3tsqte//uLORrZw/8MCDX1QIshk=; b=cMyTcvhlN7/29rz/hWJCL68mTR0N2e0rBrD9hMS5BQtUMsFcKNaCQoz4AldGESftwc gKqvv77uQ0Bn8jFYCGwB2EawS/PEfEvu1/7O8SPinYcodjj+TKstC+8+8q1D/d3d21vy RBDtLXXR0gw8D3PGK7vbxPzCaWWdyHFbduCXlMlvGbc+7M29gycvUOHEeJZKSkuOmRgn kmMyhoMo5YHR8Wf/5hSB5j7FI1QDOixC2k/CRMO9NMfuK7CfHH621t5gKGjsD6CEEb32 n73ukjogqRp6qKpo7HLypV+0C3FCx//YaNrY5JGQ+YTV17yGlfr5WzBlBT7SOGRNTwsS ipDg== X-Gm-Message-State: APjAAAVPM07+ljqMPfpwKZ4kLSNEZjYS84qN5otutPY39uLelZMGQbAO rIoqY6CbGzs/PbTlSinxFy/fCaCX7kA= X-Google-Smtp-Source: APXvYqxuJPJzG62h1yJXet9f6Xic1a/uFElFjOXfFx7//+9pVZX72dR9EZ2mHaCeuEuuUI/1zso/dA== X-Received: by 2002:a2e:2d12:: with SMTP id t18mr1437260ljt.175.1563309649301; Tue, 16 Jul 2019 13:40:49 -0700 (PDT) Received: from wasted.cogentembedded.com ([2a00:1fa0:48ac:efbd:ce47:8248:9f54:efe4]) by smtp.gmail.com with ESMTPSA id b17sm3975248ljf.34.2019.07.16.13.40.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 13:40:48 -0700 (PDT) Subject: [PATCH 2/3] scsi: fdomain: use BSTAT_{MSG|CMD|IO} in fdomain_work() From: Sergei Shtylyov To: "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org Cc: Ondrej Zary References: Organization: Cogent Embedded Message-ID: <984c196d-c10d-c855-51a2-feaf65f81ef5@cogentembedded.com> Date: Tue, 16 Jul 2019 23:40:47 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-MW 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 Commit 1697c6a64c49 ("scsi: fdomain: Add register definitions") somehow missed the masking of the 'status' variable with the SCSI phase mask in fdomain_work(), leaving the magic number intact. Fix this issue; while at it, change the order of BSTAT_{MSG|CMD|IO} bits in the MESSAGE IN phase *case* (with no change in the generated object file). Fixes: 1697c6a64c49 ("scsi: fdomain: Add register definitions") Signed-off-by: Sergei Shtylyov --- drivers/scsi/fdomain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux/drivers/scsi/fdomain.c =================================================================== --- linux.orig/drivers/scsi/fdomain.c +++ linux/drivers/scsi/fdomain.c @@ -306,7 +306,7 @@ static void fdomain_work(struct work_str status = inb(fd->base + REG_BSTAT); if (status & BSTAT_REQ) { - switch (status & 0x0e) { + switch (status & (BSTAT_MSG | BSTAT_CMD | BSTAT_IO)) { case BSTAT_CMD: /* COMMAND OUT */ outb(cmd->cmnd[cmd->SCp.sent_command++], fd->base + REG_SCSI_DATA); @@ -331,7 +331,7 @@ static void fdomain_work(struct work_str case BSTAT_MSG | BSTAT_CMD: /* MESSAGE OUT */ outb(MESSAGE_REJECT, fd->base + REG_SCSI_DATA); break; - case BSTAT_MSG | BSTAT_IO | BSTAT_CMD: /* MESSAGE IN */ + case BSTAT_MSG | BSTAT_CMD | BSTAT_IO: /* MESSAGE IN */ cmd->SCp.Message = inb(fd->base + REG_SCSI_DATA); if (!cmd->SCp.Message) ++done; From patchwork Tue Jul 16 20:41:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 11046713 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 40C0B6C5 for ; Tue, 16 Jul 2019 20:41:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2FFCD286E0 for ; Tue, 16 Jul 2019 20:41:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 24247286E4; Tue, 16 Jul 2019 20:41:59 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 BE673286E3 for ; Tue, 16 Jul 2019 20:41:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728799AbfGPUl6 (ORCPT ); Tue, 16 Jul 2019 16:41:58 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:42413 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728340AbfGPUl6 (ORCPT ); Tue, 16 Jul 2019 16:41:58 -0400 Received: by mail-lj1-f193.google.com with SMTP id t28so21307699lje.9 for ; Tue, 16 Jul 2019 13:41:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=subject:from:to:cc:references:organization:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=cYfo51s5ILy5vs6fYRJI+hfI2TvTMcjRWoeuXVKm78k=; b=TUb6OY/x4F+xA014A8jGOnmbn1Pe0qzNm5VFXRS1HXf7s1raPHJ5GqcSz6F0dxae7b PlWt9qGUz/H9U5xCrF2KdVvxvfHOK/QMLkq2mFNFzIAkj7Y3pjp0Tqfi/HAdKtZpfC2U IzAxlmvsFHqJUg8Hpj5OnOS5qQPRMYX18LL2f3Mw737Fmv9xOyLuDxqA1BfSEEgQJfhE 6mpeAzqGIy9gmOBhj+QQznlzV2mQtL35xDwG35Vk/WDFiayTgRygAN9GcLEBWVt/DVsR uBAGqZOJqTzgLCVKLj1tg/mf4ERljUB2YWS8/WTo9kIfj9AyaIZ/Ku/dxRSNrmWM5Ckf G9Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=cYfo51s5ILy5vs6fYRJI+hfI2TvTMcjRWoeuXVKm78k=; b=sFpjeYwBJd1bUcDfRgL4BFhDTR1MPrXOZG9mjF+xgFEwzvenQCjv8FnFXL1y6OTkCG VmUOy6SAawdMMP+pxwOKKxKv6ZJpqwGUE4nC5mdJDz2Q2GM8SFRjzDprfFKERiSfYk8O zew8er/NpDP/vd0J1x8G5eFqU+MxnRFuzhU2lTcj2X6I6sd+LUdkDAPH7nUbGag8gUa6 q1bngCjZlUmp5ivJCQo6lqZykU2u/hm4QuXKUtmSlB3OMIyMSY8bYT7RH9iu7WkUy+vt PWfkjE7x0W7SnVHkgruKH591oAkbUnJSsh8Yyt7rEEYeNKNmVFOAr/GMEqN/npkje7OQ eKPQ== X-Gm-Message-State: APjAAAWemS++T/zz1cb/H9XB+6jp9g4TuV1htyKdz2pzmpYazNqyW4EX hYS5pC0kADODRQgXlaXLX/YvgQ== X-Google-Smtp-Source: APXvYqy88gq0RKPnnDoT4IQvXjvXXFv4M5t+3NcdGlkDa/IRUvKPgXgTaGlFZv4qRP/KrhqYw1rkNA== X-Received: by 2002:a05:651c:87:: with SMTP id 7mr11260472ljq.184.1563309716523; Tue, 16 Jul 2019 13:41:56 -0700 (PDT) Received: from wasted.cogentembedded.com ([2a00:1fa0:48ac:efbd:ce47:8248:9f54:efe4]) by smtp.gmail.com with ESMTPSA id k8sm3935992lja.24.2019.07.16.13.41.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 13:41:56 -0700 (PDT) Subject: [PATCH 3/3] scsi: fdomain_isa: use CFG1_IRQ_MASK From: Sergei Shtylyov To: "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org Cc: Ondrej Zary References: Organization: Cogent Embedded Message-ID: Date: Tue, 16 Jul 2019 23:41:54 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-MW 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 Commit 1697c6a64c49 ("scsi: fdomain: Add register definitions") somehow missed the uses of CFG1_IRQ_MASK in the Futire Domain ISA driver, leaving the magic numbers intact. Fix this issue (with no change in the generated object file), removing an excess empty line, while at it... Fixes: 1697c6a64c49 ("scsi: fdomain: Add register definitions") Signed-off-by: Sergei Shtylyov --- drivers/scsi/fdomain_isa.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Index: linux/drivers/scsi/fdomain_isa.c =================================================================== --- linux.orig/drivers/scsi/fdomain_isa.c +++ linux/drivers/scsi/fdomain_isa.c @@ -131,8 +131,7 @@ static int fdomain_isa_match(struct devi if (!request_region(base, FDOMAIN_REGION_SIZE, "fdomain_isa")) return 0; - irq = irqs[(inb(base + REG_CFG1) & 0x0e) >> 1]; - + irq = irqs[(inb(base + REG_CFG1) & CFG1_IRQ_MASK) >> 1]; if (sig) this_id = sig->this_id; @@ -164,7 +163,7 @@ static int fdomain_isa_param_match(struc } if (irq_ <= 0) - irq_ = irqs[(inb(io[ndev] + REG_CFG1) & 0x0e) >> 1]; + irq_ = irqs[(inb(io[ndev] + REG_CFG1) & CFG1_IRQ_MASK) >> 1]; sh = fdomain_create(io[ndev], irq_, scsi_id[ndev], dev); if (!sh) {