Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp5848096ybn; Sun, 29 Sep 2019 07:02:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqyQPoXJHBKP7MejlTkH20dawdXeuZpI10gtsClBVqPx2fyDcGytdbaDnJjkSlmHkHUaVHOv X-Received: by 2002:a17:906:eddb:: with SMTP id sb27mr15538248ejb.304.1569765729326; Sun, 29 Sep 2019 07:02:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569765729; cv=none; d=google.com; s=arc-20160816; b=rvksJiaGIQed/wdo7b7rImioQy622asJOzB+v6W8UbZ6CR6MeIGA4stW3EsrS7/MTX aGnjTyW3+QhzWhkZEJ4eXTx0DlsCLOz5B6kP0XJxPr7/ON0L1928hc2f4tOc2UWZJ6Dj 3QBBfCdW4hn+Ks9I4SmFkY2NLOpxNe8MPNlbo2LOct72WQxaw9adWJ0vaRS7g6oXvqn8 bfdrn1JUsNxj2yAPJwkFJLU0MRno/toaf1he2QAA4URqUfLlFfr/xFa9Ck0lLg9Wib6V tb8wgHngsoA4QSpypSo1esJCMIXv+0QG3Z7DgqwV4Pi26zjzGQ+hw0w1rpSyUUs58Q+X lM+Q== 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=dpM7c27yKcmzpKC9GJv74RsPj7Nb2emS/2yPrQfm6vI=; b=e0X9welxMlZMY0+jb5M13Sre1QKPoB2FC7GEMrjvXozFWRBM1cEqjPzaLmakGNMO0E 3ka6S0VttD9ZazOzkmdwhoL3wbFzTLEHIATUPyfp4+K8ctIPjmn/fDgyzU0Bbl51Agpb Qiu6DyArhjjHBA5FxjSCWCz0DUVzQqX+psPhUnudhsX+jRVtRFMcu3c+ajIrSonc36pi Rss3gw+5hOCpszzcm7osL+CtEBn95rysFn88ncicBbkShloI39//IW3hD6YPYqtY39Zv PylLI69sAWE7Kt+7IpEWa/wNZwAbSLJNDBrePLCKxVTH1GGGqhUy6xNl8goMtNhfypDT EoMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="cQcC/DjJ"; 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 i20si5006513edy.426.2019.09.29.07.01.44; Sun, 29 Sep 2019 07:02:09 -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="cQcC/DjJ"; 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 S1729974AbfI2OBF (ORCPT + 99 others); Sun, 29 Sep 2019 10:01:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:43156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729385AbfI2OBE (ORCPT ); Sun, 29 Sep 2019 10:01:04 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 31A402086A; Sun, 29 Sep 2019 14:01:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569765663; bh=oJ1DAPC6i1yD3poQaOwZoOjZyJqHHxMJuBpIZsKKyd8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cQcC/DjJaYmi1gQ3xBcboEjgX7ZdS72RIPbnVMM4dcrt3XZ4qTNYu12nvz17/VeTw /xU5qPN62JRXERVptZoPqSv/FA9F3LEL1jgpZWWKfctevF5dkSzjfVt2lHHl6Ckdme kUW2R2pq0u7ooWzsCcqGaYB5GshgSOhJl3afrnak= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Greg Kurz , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Michael Ellerman Subject: [PATCH 5.2 09/45] powerpc/xive: Fix bogus error code returned by OPAL Date: Sun, 29 Sep 2019 15:55:37 +0200 Message-Id: <20190929135027.480058711@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190929135024.387033930@linuxfoundation.org> References: <20190929135024.387033930@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: Greg Kurz commit 6ccb4ac2bf8a35c694ead92f8ac5530a16e8f2c8 upstream. There's a bug in skiboot that causes the OPAL_XIVE_ALLOCATE_IRQ call to return the 32-bit value 0xffffffff when OPAL has run out of IRQs. Unfortunatelty, OPAL return values are signed 64-bit entities and errors are supposed to be negative. If that happens, the linux code confusingly treats 0xffffffff as a valid IRQ number and panics at some point. A fix was recently merged in skiboot: e97391ae2bb5 ("xive: fix return value of opal_xive_allocate_irq()") but we need a workaround anyway to support older skiboots already in the field. Internally convert 0xffffffff to OPAL_RESOURCE which is the usual error returned upon resource exhaustion. Cc: stable@vger.kernel.org # v4.12+ Signed-off-by: Greg Kurz Reviewed-by: Cédric Le Goater Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/156821713818.1985334.14123187368108582810.stgit@bahia.lan Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/include/asm/opal.h | 2 +- arch/powerpc/platforms/powernv/opal-call.c | 2 +- arch/powerpc/sysdev/xive/native.c | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) --- a/arch/powerpc/include/asm/opal.h +++ b/arch/powerpc/include/asm/opal.h @@ -272,7 +272,7 @@ int64_t opal_xive_get_vp_info(uint64_t v int64_t opal_xive_set_vp_info(uint64_t vp, uint64_t flags, uint64_t report_cl_pair); -int64_t opal_xive_allocate_irq(uint32_t chip_id); +int64_t opal_xive_allocate_irq_raw(uint32_t chip_id); int64_t opal_xive_free_irq(uint32_t girq); int64_t opal_xive_sync(uint32_t type, uint32_t id); int64_t opal_xive_dump(uint32_t type, uint32_t id); --- a/arch/powerpc/platforms/powernv/opal-call.c +++ b/arch/powerpc/platforms/powernv/opal-call.c @@ -257,7 +257,7 @@ OPAL_CALL(opal_xive_set_queue_info, OPA OPAL_CALL(opal_xive_donate_page, OPAL_XIVE_DONATE_PAGE); OPAL_CALL(opal_xive_alloc_vp_block, OPAL_XIVE_ALLOCATE_VP_BLOCK); OPAL_CALL(opal_xive_free_vp_block, OPAL_XIVE_FREE_VP_BLOCK); -OPAL_CALL(opal_xive_allocate_irq, OPAL_XIVE_ALLOCATE_IRQ); +OPAL_CALL(opal_xive_allocate_irq_raw, OPAL_XIVE_ALLOCATE_IRQ); OPAL_CALL(opal_xive_free_irq, OPAL_XIVE_FREE_IRQ); OPAL_CALL(opal_xive_get_vp_info, OPAL_XIVE_GET_VP_INFO); OPAL_CALL(opal_xive_set_vp_info, OPAL_XIVE_SET_VP_INFO); --- a/arch/powerpc/sysdev/xive/native.c +++ b/arch/powerpc/sysdev/xive/native.c @@ -231,6 +231,17 @@ static bool xive_native_match(struct dev return of_device_is_compatible(node, "ibm,opal-xive-vc"); } +static s64 opal_xive_allocate_irq(u32 chip_id) +{ + s64 irq = opal_xive_allocate_irq_raw(chip_id); + + /* + * Old versions of skiboot can incorrectly return 0xffffffff to + * indicate no space, fix it up here. + */ + return irq == 0xffffffff ? OPAL_RESOURCE : irq; +} + #ifdef CONFIG_SMP static int xive_native_get_ipi(unsigned int cpu, struct xive_cpu *xc) {