From patchwork Mon Feb 18 17:43:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 158637 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2756914jaa; Mon, 18 Feb 2019 09:43:29 -0800 (PST) X-Google-Smtp-Source: AHgI3IZKY7gXRsk0q+Sb1PLHRL2WiZO03aFpuYkD/HLAQCeb24GbMfHrB80Tq+Qm4OiRdj4qjdQx X-Received: by 2002:a62:b15:: with SMTP id t21mr26041227pfi.136.1550511808956; Mon, 18 Feb 2019 09:43:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550511808; cv=none; d=google.com; s=arc-20160816; b=soFZ9rEHgScSKnHgCgoQCWMypBY0hZ23GT/909RuzoUOdrr8vg1XQUHwaU+RDZLCaM fA6P//bTmDLEee0iS2fQfkJZ+wqLxZCHgQCVe3+1k1CxIBjmpR7EPGM8Es/XemUPAZZt omftXJG+HXZFZPvSxKEd873KK5oDjk9PWZmC8RfqX1A4Fg7J86E/a9YvQZmslKbXdbpT 0T6/SLz9zmakcRUoeiH/0nDJROiWAK+/Zwz1xxfa+PPYT5iFtbtXWgqS+cv/pjHLPyqV 1HAwNaMqcrDq+aIX/VEckop32x9XRfoR+rx74oj/u+yAmC9pYk5wwuNcfTsxpGq0B+Hf jGYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from; bh=6BLwdooXeC+4PxE2+8IGGMJYYvy/5K7COu85LSVkdIQ=; b=bqP40H4O8syBeXwadBHsbXkNYYrbJ9A4aJdjga08PiP3uVqKbi67vJNpzXwyJvbYKb CZwtsmN7KWka2bbNoo5B6dPjhCsmA3WAIvmxlXDE98ElenAdmvA70N5M7s9/Y1lmGUvF E3lbQsqZVqElGHh82EjiiCKkFRE06AKiN8KuBC06PctRsxdykr1qOX6D2Lg2sW87I9t/ I0jyXH2shDdBOhOgzXlfuN2t0jB6wnyzLBL79Wf0Ak49G3hTDH1AkZMqbRZHy4i0FK4/ Nqkz91D5Th80H2F59jPi83jyUxJ/o1rV09dtCzhWrv0yIMP6mJQJJICsOKekUi9Z4z+O 5XKA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e17si12791156pgv.452.2019.02.18.09.43.28; Mon, 18 Feb 2019 09:43:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391367AbfBRRn1 (ORCPT + 32 others); Mon, 18 Feb 2019 12:43:27 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:3675 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2387866AbfBRRn0 (ORCPT ); Mon, 18 Feb 2019 12:43:26 -0500 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id D11F17895CA3EB9EB557; Tue, 19 Feb 2019 01:43:22 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.408.0; Tue, 19 Feb 2019 01:43:16 +0800 From: John Garry To: CC: , , , John Garry Subject: [PATCH] ata: libahci: Only warn for AHCI_HFLAG_MULTI_MSI set when genuine custom irq handler implemented Date: Tue, 19 Feb 2019 01:43:33 +0800 Message-ID: <1550511813-133136-1-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For an AHCI controller with AHCI_HFLAG_MULTI_MSI flag set, we may get the following log, regardless of whether a custom irq handler was implemented or not: [ 14.700238] ahci 0000:74:03.0: both AHCI_HFLAG_MULTI_MSI flag set and custom irq handler implemented This is because we can set hpriv->irq_handler to ahci_single_level_irq_intr() if not already set, in ahci_init_one()->ahci_pci_save_initial_config()->ahci_save_initial_config(). Stop having this warn being misleading by adding a check for hpriv->irq_handler != ahci_single_level_irq_intr. Signed-off-by: John Garry -- 2.17.1 diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index b5f57c69c487..692782dddc0f 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -2599,7 +2599,8 @@ int ahci_host_activate(struct ata_host *host, struct scsi_host_template *sht) int rc; if (hpriv->flags & AHCI_HFLAG_MULTI_MSI) { - if (hpriv->irq_handler) + if (hpriv->irq_handler && + hpriv->irq_handler != ahci_single_level_irq_intr) dev_warn(host->dev, "both AHCI_HFLAG_MULTI_MSI flag set and custom irq handler implemented\n"); if (!hpriv->get_irq_vector) {