From patchwork Mon Oct 31 20:18:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 9406427 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 33D4660722 for ; Mon, 31 Oct 2016 20:21:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F49328A94 for ; Mon, 31 Oct 2016 20:21:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1444628ACF; Mon, 31 Oct 2016 20:21:39 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable 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 9F5B028AAC for ; Mon, 31 Oct 2016 20:21:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S946391AbcJaUSw (ORCPT ); Mon, 31 Oct 2016 16:18:52 -0400 Received: from ns.gsystem.sk ([62.176.172.50]:36101 "EHLO gsystem.sk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S946363AbcJaUSt (ORCPT ); Mon, 31 Oct 2016 16:18:49 -0400 Received: from stip-static-68.213-81-217.telecom.sk ([213.81.217.68] helo=gsql.ggedos.sk) by gsystem.sk with esmtpsa (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1c1J2Z-0001DX-Ko; Mon, 31 Oct 2016 21:18:43 +0100 From: Ondrej Zary To: Christoph Hellwig Cc: Finn Thain , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] g_NCR5380: Add IRQ auto-configuration for HP C2502 Date: Mon, 31 Oct 2016 21:18:30 +0100 Message-Id: <1477945112-25659-5-git-send-email-linux@rainbow-software.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1477945112-25659-1-git-send-email-linux@rainbow-software.org> References: <1477945112-25659-1-git-send-email-linux@rainbow-software.org> 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 Find free and working IRQ automatically on HP C2502 cards. Also allow IRQ 9 to work (aliases to IRQ 2 on the card). Signed-off-by: Ondrej Zary --- drivers/scsi/g_NCR5380.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c index e713dba..27fc499 100644 --- a/drivers/scsi/g_NCR5380.c +++ b/drivers/scsi/g_NCR5380.c @@ -156,6 +156,8 @@ static void magic_configure(int idx, u8 irq, u8 magic[]) outb(magic[4], 0x379); /* allowed IRQs for HP C2502 */ + if (irq == 9) + irq = 2; if (irq != 2 && irq != 3 && irq != 4 && irq != 5 && irq != 7) irq = 0; if (idx >= 0 && idx <= 7) @@ -163,6 +165,21 @@ static void magic_configure(int idx, u8 irq, u8 magic[]) outb(cfg, 0x379); } +/* find a free and working IRQ (for HP C2502) */ +static int NCR5380_find_irq(struct Scsi_Host *instance, u8 irqs[], + int port_idx, u8 magic[]) +{ + int i; + + for (i = 0; irqs[i]; i++) { + magic_configure(port_idx, irqs[i], magic); + if (NCR5380_test_irq(instance, irqs[i]) == 0) + return irqs[i]; + } + magic_configure(port_idx, 0, magic); + return NO_IRQ; +} + static unsigned int ncr_53c400a_ports[] = { 0x280, 0x290, 0x300, 0x310, 0x330, 0x340, 0x348, 0x350, 0 }; @@ -175,6 +192,9 @@ static void magic_configure(int idx, u8 irq, u8 magic[]) static u8 hp_c2502_magic[] = { /* HP C2502 */ 0x0f, 0x22, 0xf0, 0x20, 0x80 }; +static u8 hp_c2502_irqs[] = { + 9, 5, 7, 3, 4, 0 +}; static int generic_NCR5380_init_one(struct scsi_host_template *tpnt, struct device *pdev, int base, int irq, int board) @@ -345,8 +365,13 @@ static int generic_NCR5380_init_one(struct scsi_host_template *tpnt, if (irq != IRQ_AUTO) instance->irq = irq; - else - instance->irq = NCR5380_probe_irq(instance); + else { + if (board == BOARD_HP_C2502) + instance->irq = NCR5380_find_irq(instance, + hp_c2502_irqs, port_idx, magic); + else + instance->irq = NCR5380_probe_irq(instance); + } /* Compatibility with documented NCR5380 kernel parameters */ if (instance->irq == 255)