Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2745234ybg; Mon, 28 Oct 2019 01:28:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqwtAlwxphc3WfecIFKiHnoN6BsvqA5wdSfHoiNKgIGfMjJqxeMeMaWOJfc0oVJP/yfjqXwV X-Received: by 2002:a05:6402:1482:: with SMTP id e2mr4405948edv.207.1572251337596; Mon, 28 Oct 2019 01:28:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572251337; cv=none; d=google.com; s=arc-20160816; b=HhWd88TVEjSXAueH3V/HdJeSxgzKoIXTKX5u/WEjb02pgpSLCAsOkiJfK2f7aTMSAJ yQt73iQwyDiAIRwUYcuuPC11xcrXLAqS3XlK0S28yMwyFycw2e4PMaQPtbsdkR3fqMgv 4rB9/wjEF68ALgZ3wf2C+OhW/xIfMYEfh8u7zg2ABCL2CG+B8xGYNBpnZJOYHraCoQvn be3qKlkZq72H1lW4WnYzMlU6HYTAP0keKKl3to060eIVVq2C7rY4QDBsnwAKTU0kpJPF HbCKqi6Gs4kE8m8AOhkBKFRwUZrYtWoVzPiKLDlTq5ncSdJ9lTL/X3/LePDcsEiK0ddF iuBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rfCHXmDXWChfITMJMDVRTLR8F9WSQpxlYIlVTBaIsG8=; b=WQT0aS7irhWIJR+NM7/pK5ZBhH3MENBVEA72ZC8jPNTi7ARS3DBsbbBI6wv2RkiGTA LV05UFnamAvntaSsyyybsEhL4JZERDXTEJntFlK/zaevm++LtCuUpZTc+3GfmDk/yQYO HAMhXroJnaB60RoZvaFr5jBf78Cp+Xv6klqwMF8xbSEqm/rccnUx+DVNP2gf+vmEQOHX mpimn8PYGUdOa62Iyp/zxjLJlslunWXIOnKOepYm2LGOboJxQZhGb2LplXAtrfyQ8RkR 3NWo4EtY3qhj+flq0i6SlMygKrZ97eC9GTYXbfaO0YDesV/9jiQvQR46jzEOf0OjNBD2 SiTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=EvZlq41b; 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 h58si7564321eda.18.2019.10.28.01.28.34; Mon, 28 Oct 2019 01:28:57 -0700 (PDT) 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; dkim=pass header.i=@kernel.org header.s=default header.b=EvZlq41b; 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 S1731717AbfJ0VUa (ORCPT + 99 others); Sun, 27 Oct 2019 17:20:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:40972 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730775AbfJ0VU0 (ORCPT ); Sun, 27 Oct 2019 17:20:26 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A78B0205C9; Sun, 27 Oct 2019 21:20:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211226; bh=dpkgng9xeRaRt0F4oNfxz4++ewDMoAlP1wKnaRG1FoU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EvZlq41bOGu+ilB+rGnzKHdrNtQdzn13f9vbwvHdJxVAwob8tBCU9b8mkYq5aoduH d8NfaYjXQ5RcavXBp28VwwSkpQ4nhmGc6TWtLxiY4SR5ZBwRx1X2HFPqc7Nt8JFeZO o80cT69L4y5Q2RGuTPQSBFOhFiVa6izfd1RgvfH0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , "David S. Miller" Subject: [PATCH 5.3 075/197] net/ibmvnic: Fix EOI when running in XIVE mode. Date: Sun, 27 Oct 2019 21:59:53 +0100 Message-Id: <20191027203355.692991500@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "C?dric Le Goater" [ Upstream commit 11d49ce9f7946dfed4dcf5dbde865c78058b50ab ] pSeries machines on POWER9 processors can run with the XICS (legacy) interrupt mode or with the XIVE exploitation interrupt mode. These interrupt contollers have different interfaces for interrupt management : XICS uses hcalls and XIVE loads and stores on a page. H_EOI being a XICS interface the enable_scrq_irq() routine can fail when the machine runs in XIVE mode. Fix that by calling the EOI handler of the interrupt chip. Fixes: f23e0643cd0b ("ibmvnic: Clear pending interrupt after device reset") Signed-off-by: Cédric Le Goater Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/ibm/ibmvnic.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -2772,12 +2772,10 @@ static int enable_scrq_irq(struct ibmvni if (adapter->resetting && adapter->reset_reason == VNIC_RESET_MOBILITY) { - u64 val = (0xff000000) | scrq->hw_irq; + struct irq_desc *desc = irq_to_desc(scrq->irq); + struct irq_chip *chip = irq_desc_get_chip(desc); - rc = plpar_hcall_norets(H_EOI, val); - if (rc) - dev_err(dev, "H_EOI FAILED irq 0x%llx. rc=%ld\n", - val, rc); + chip->irq_eoi(&desc->irq_data); } rc = plpar_hcall_norets(H_VIOCTL, adapter->vdev->unit_address,