From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oa1-f49.google.com (mail-oa1-f49.google.com [209.85.160.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ED321F4F1 for ; Mon, 12 Aug 2024 01:01:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723424484; cv=none; b=eHQRNFp2LxHXEHBLaIQczcD48yF+gBg2UwQDX+sVE8rWRpF082T1vwOl9F/zSgLm6ZI6Xd99v/49pvE1Y94/MZmQOlcYVJZ9WQtVDms71u1q5/w7PkX6XgULu7uGd0R+NwGnxFRZRssCcS5sGVJKg8eNFBqUU7lg36S2NB/OF/k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723424484; c=relaxed/simple; bh=W+5wPYRyiEMTqdJlSnn47qe/NPZNGjm56TM6xxTbs9Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ATtkgZaL4id8wHRpBNL1wKgsy8/Si01re6eVJcFEWoekT0YdxP1TVnSctdZOlR+VQEKgAW4wi1tdS7GUJIcm3ieHhxNGhUqkz6/qgGci2mCtxAeiQLIewu1FzQmyPQiklSMERSUeYeqv/UUZiv8YgpLoJLEFSL6W62nuOdD6SII= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com; spf=pass smtp.mailfrom=ventanamicro.com; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b=dax2QtA6; arc=none smtp.client-ip=209.85.160.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="dax2QtA6" Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-260f1664fdfso2197552fac.1 for ; Sun, 11 Aug 2024 18:01:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1723424482; x=1724029282; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TMzQ3ciSNyAJUT1sxzxGDbpLjSEaz3yLiVcKcHEYKY4=; b=dax2QtA6pKwXN4aZL16EKLImKWZNKTSyIqeeQAoYxEZObd/YmNGv0qukpPtk9I//nc 8O8Xos0WL8zpyJ9rwD1xDnMr0IqRp+7wPJ3FuBQ2dev4U7j5MtklYo3NivPyJi+nKGrc rLVCge5/lpgAiGyD20lL4+vEEClqjj6gf4/dNuT6HazIN74io6PfqIs0bGs3QN0g8mB1 AcnJKzYilQuoGjUT11UrfMFLrP0mfsHgSjUkteHJ0bYce7pUInd8uOytMwugWIxbdvHa pWLvWHRrye5ytuvo+5kNjI+6UhlhHrxh4WSwB7Eo6JkdKP9tQbVUaaAlENRP+DVBrMtG 9Csw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723424482; x=1724029282; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TMzQ3ciSNyAJUT1sxzxGDbpLjSEaz3yLiVcKcHEYKY4=; b=r6GTVe0ySZByZvMMJo2spz0Ynvwh62k3gLD5T+pXCuc+rAC/DGTIHbEsX8u5Ji0A9A kuiR1uLqgYhlIhwqehV6UIZz5JnpX6K4IeGlUs75HWxKueuSkxlJntLPFlibxxS5XDgB iPBXaOKdmZ/qdq+hizfeEwRUdb5m2H4whXBXgfHYZVWmaT4gnlc3k9doc3JC8T587caT inC61eDuwT3pUE+GXhjCwmm755Cspc2R0LI8hkftBy29htbiv6zFMzF5ej8eTpfDoe4H didUEGZ50na5CMBtXCV7AM93VKTVnGc+W2f/ozoCv0uT4+A3JYjI/xwBl6JDfBc/ON0o 8i7A== X-Forwarded-Encrypted: i=1; AJvYcCVw3XzJd+/dqkLqk6rIE1vTwSrHUuwUtEJ9MI2jgiJjuZIcmjmDBcmVlWpXdSh9+V7efTHhDoKQJ4w+dUjd9RcTzqWAt93KRmIIlrbO X-Gm-Message-State: AOJu0YxU8bnN2aqTtcY2BC+DZhZGQYL89w/Df2/ocCup5fqfkIpKTXBS PiI3J0w7pcjM9N9VCgKmhOrskDSRfQ/xMxiSGWI6oXjWOLRhUAVBBub8hrv3nBE7TVGt1OrEAnV rGD3f4w== X-Google-Smtp-Source: AGHT+IHvjLsKNVgfioV52ZJQ6mkbTpTRo5xo8Ywht9O8CCjHZJ+ipOfWkzdibzywTZdRtlaqHgD09g== X-Received: by 2002:a05:6870:e38f:b0:261:2357:5a29 with SMTP id 586e51a60fabf-26c62f9f8admr6644942fac.46.1723424482033; Sun, 11 Aug 2024 18:01:22 -0700 (PDT) Received: from sunil-pc.tail07344b.ts.net ([106.51.198.16]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7c3dbe8cbdcsm3074062a12.61.2024.08.11.18.01.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Aug 2024 18:01:21 -0700 (PDT) From: Sunil V L To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-riscv@lists.infradead.org, linux-acpi@vger.kernel.org, acpica-devel@lists.linux.dev Cc: Will Deacon , Paul Walmsley , Palmer Dabbelt , Albert Ou , "Rafael J . Wysocki" , Len Brown , Bjorn Helgaas , Anup Patel , Thomas Gleixner , Samuel Holland , Robert Moore , Conor Dooley , Haibo Xu , Andrew Jones , Atish Kumar Patra , Drew Fustini , Sunil V L , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= Subject: [PATCH v8 16/17] irqchip/riscv-aplic: Add ACPI support Date: Mon, 12 Aug 2024 06:29:28 +0530 Message-ID: <20240812005929.113499-17-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240812005929.113499-1-sunilvl@ventanamicro.com> References: <20240812005929.113499-1-sunilvl@ventanamicro.com> Precedence: bulk X-Mailing-List: acpica-devel@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=cp1252 Content-Transfer-Encoding: 8bit Add ACPI support in APLIC drivers. Use the mapping created early during boot to get the details about the APLIC. Signed-off-by: Sunil V L Reviewed-by: Anup Patel Tested-by: Björn Töpel --- drivers/irqchip/irq-riscv-aplic-direct.c | 22 +++++--- drivers/irqchip/irq-riscv-aplic-main.c | 69 ++++++++++++++++-------- drivers/irqchip/irq-riscv-aplic-main.h | 1 + drivers/irqchip/irq-riscv-aplic-msi.c | 9 +++- 4 files changed, 69 insertions(+), 32 deletions(-) diff --git a/drivers/irqchip/irq-riscv-aplic-direct.c b/drivers/irqchip/irq-riscv-aplic-direct.c index 4a3ffe856d6c..7cd6b646774b 100644 --- a/drivers/irqchip/irq-riscv-aplic-direct.c +++ b/drivers/irqchip/irq-riscv-aplic-direct.c @@ -4,6 +4,7 @@ * Copyright (C) 2022 Ventana Micro Systems Inc. */ +#include #include #include #include @@ -189,17 +190,22 @@ static int aplic_direct_starting_cpu(unsigned int cpu) } static int aplic_direct_parse_parent_hwirq(struct device *dev, u32 index, - u32 *parent_hwirq, unsigned long *parent_hartid) + u32 *parent_hwirq, unsigned long *parent_hartid, + struct aplic_priv *priv) { struct of_phandle_args parent; + unsigned long hartid; int rc; - /* - * Currently, only OF fwnode is supported so extend this - * function for ACPI support. - */ - if (!is_of_node(dev->fwnode)) - return -EINVAL; + if (!is_of_node(dev->fwnode)) { + hartid = acpi_rintc_ext_parent_to_hartid(priv->acpi_aplic_id, index); + if (hartid == INVALID_HARTID) + return -ENODEV; + + *parent_hartid = hartid; + *parent_hwirq = RV_IRQ_EXT; + return 0; + } rc = of_irq_parse_one(to_of_node(dev->fwnode), index, &parent); if (rc) @@ -237,7 +243,7 @@ int aplic_direct_setup(struct device *dev, void __iomem *regs) /* Setup per-CPU IDC and target CPU mask */ current_cpu = get_cpu(); for (i = 0; i < priv->nr_idcs; i++) { - rc = aplic_direct_parse_parent_hwirq(dev, i, &hwirq, &hartid); + rc = aplic_direct_parse_parent_hwirq(dev, i, &hwirq, &hartid, priv); if (rc) { dev_warn(dev, "parent irq for IDC%d not found\n", i); continue; diff --git a/drivers/irqchip/irq-riscv-aplic-main.c b/drivers/irqchip/irq-riscv-aplic-main.c index 28dd175b5764..cbe97886364c 100644 --- a/drivers/irqchip/irq-riscv-aplic-main.c +++ b/drivers/irqchip/irq-riscv-aplic-main.c @@ -4,8 +4,10 @@ * Copyright (C) 2022 Ventana Micro Systems Inc. */ +#include #include #include +#include #include #include #include @@ -125,39 +127,50 @@ static void aplic_init_hw_irqs(struct aplic_priv *priv) writel(0, priv->regs + APLIC_DOMAINCFG); } +#ifdef CONFIG_ACPI +static const struct acpi_device_id aplic_acpi_match[] = { + { "RSCV0002", 0 }, + {} +}; +MODULE_DEVICE_TABLE(acpi, aplic_acpi_match); + +#endif + int aplic_setup_priv(struct aplic_priv *priv, struct device *dev, void __iomem *regs) { struct device_node *np = to_of_node(dev->fwnode); struct of_phandle_args parent; int rc; - /* - * Currently, only OF fwnode is supported so extend this - * function for ACPI support. - */ - if (!np) - return -EINVAL; - /* Save device pointer and register base */ priv->dev = dev; priv->regs = regs; - /* Find out number of interrupt sources */ - rc = of_property_read_u32(np, "riscv,num-sources", &priv->nr_irqs); - if (rc) { - dev_err(dev, "failed to get number of interrupt sources\n"); - return rc; - } + if (np) { + /* Find out number of interrupt sources */ + rc = of_property_read_u32(np, "riscv,num-sources", &priv->nr_irqs); + if (rc) { + dev_err(dev, "failed to get number of interrupt sources\n"); + return rc; + } - /* - * Find out number of IDCs based on parent interrupts - * - * If "msi-parent" property is present then we ignore the - * APLIC IDCs which forces the APLIC driver to use MSI mode. - */ - if (!of_property_present(np, "msi-parent")) { - while (!of_irq_parse_one(np, priv->nr_idcs, &parent)) - priv->nr_idcs++; + /* + * Find out number of IDCs based on parent interrupts + * + * If "msi-parent" property is present then we ignore the + * APLIC IDCs which forces the APLIC driver to use MSI mode. + */ + if (!of_property_present(np, "msi-parent")) { + while (!of_irq_parse_one(np, priv->nr_idcs, &parent)) + priv->nr_idcs++; + } + } else { + rc = riscv_acpi_get_gsi_info(dev->fwnode, &priv->gsi_base, &priv->acpi_aplic_id, + &priv->nr_irqs, &priv->nr_idcs); + if (rc) { + dev_err(dev, "failed to find GSI mapping\n"); + return rc; + } } /* Setup initial state APLIC interrupts */ @@ -184,7 +197,11 @@ static int aplic_probe(struct platform_device *pdev) * If msi-parent property is present then setup APLIC MSI * mode otherwise setup APLIC direct mode. */ - msi_mode = of_property_present(to_of_node(dev->fwnode), "msi-parent"); + if (is_of_node(dev->fwnode)) + msi_mode = of_property_present(to_of_node(dev->fwnode), "msi-parent"); + else + msi_mode = imsic_acpi_get_fwnode(NULL) ? 1 : 0; + if (msi_mode) rc = aplic_msi_setup(dev, regs); else @@ -192,6 +209,11 @@ static int aplic_probe(struct platform_device *pdev) if (rc) dev_err(dev, "failed to setup APLIC in %s mode\n", msi_mode ? "MSI" : "direct"); +#ifdef CONFIG_ACPI + if (!acpi_disabled) + acpi_dev_clear_dependencies(ACPI_COMPANION(dev)); +#endif + return rc; } @@ -204,6 +226,7 @@ static struct platform_driver aplic_driver = { .driver = { .name = "riscv-aplic", .of_match_table = aplic_match, + .acpi_match_table = ACPI_PTR(aplic_acpi_match), }, .probe = aplic_probe, }; diff --git a/drivers/irqchip/irq-riscv-aplic-main.h b/drivers/irqchip/irq-riscv-aplic-main.h index 4393927d8c80..b0ad8cde69b1 100644 --- a/drivers/irqchip/irq-riscv-aplic-main.h +++ b/drivers/irqchip/irq-riscv-aplic-main.h @@ -28,6 +28,7 @@ struct aplic_priv { u32 gsi_base; u32 nr_irqs; u32 nr_idcs; + u32 acpi_aplic_id; void __iomem *regs; struct aplic_msicfg msicfg; }; diff --git a/drivers/irqchip/irq-riscv-aplic-msi.c b/drivers/irqchip/irq-riscv-aplic-msi.c index d7773f76e5d0..945bff28265c 100644 --- a/drivers/irqchip/irq-riscv-aplic-msi.c +++ b/drivers/irqchip/irq-riscv-aplic-msi.c @@ -175,6 +175,7 @@ static const struct msi_domain_template aplic_msi_template = { int aplic_msi_setup(struct device *dev, void __iomem *regs) { const struct imsic_global_config *imsic_global; + struct irq_domain *msi_domain; struct aplic_priv *priv; struct aplic_msicfg *mc; phys_addr_t pa; @@ -257,8 +258,14 @@ int aplic_msi_setup(struct device *dev, void __iomem *regs) * IMSIC and the IMSIC MSI domains are created later through * the platform driver probing so we set it explicitly here. */ - if (is_of_node(dev->fwnode)) + if (is_of_node(dev->fwnode)) { of_msi_configure(dev, to_of_node(dev->fwnode)); + } else { + msi_domain = irq_find_matching_fwnode(imsic_acpi_get_fwnode(dev), + DOMAIN_BUS_PLATFORM_MSI); + if (msi_domain) + dev_set_msi_domain(dev, msi_domain); + } } if (!msi_create_device_irq_domain(dev, MSI_DEFAULT_DOMAIN, &aplic_msi_template, -- 2.43.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 33B7BC52D7C for ; Mon, 12 Aug 2024 01:09:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=QDAf4emJNIv9pEY4+0oZeU6Zs1SHDgJqDaxcCwZojZ0=; b=ZbDhfiR/tsGH0b bF2xi3jepRLxMppBcBGmlxYg72tPJX7JVjiRep71i9/NLSmYTBljiXeQSbh1iVdk6z3jlFo6H3qAD 23M77qR9dV0gjwHyhpHr7yN5L9Tk8qa2EbwtCOt9Z60+5a+UOpx4Zjm8nRFtExOr0i1JwiTH0lhVW LBVxMG1Pe0T2WuZaGbXrszwV3QmUNkgwXkPitRZCGjwM8fAFwzFB8CLu88lyQYgtxT834CjeTKOAt e6y+PMu9mvdE1kGymii/FvoeJo9CPT2V7umkJxSURm/8SEYVkOGpjPPjGeeCPlHuawZwqy9hdeB9s le4ipBrBNe9CrpWazbVA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sdJZ4-0000000GcZD-49op; Mon, 12 Aug 2024 01:09:38 +0000 Received: from mail-oa1-x2b.google.com ([2001:4860:4864:20::2b]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sdJR5-0000000GaVf-1jkM for linux-riscv@lists.infradead.org; Mon, 12 Aug 2024 01:01:25 +0000 Received: by mail-oa1-x2b.google.com with SMTP id 586e51a60fabf-26106ec9336so2035587fac.2 for ; Sun, 11 Aug 2024 18:01:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1723424482; x=1724029282; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TMzQ3ciSNyAJUT1sxzxGDbpLjSEaz3yLiVcKcHEYKY4=; b=Ub9tdufGw2anzGwW9Pr3UQzkLRYbgyjJceUY9MkYH/XsVwu3dk9ac1bNXcBThO9IF4 cGU0DC37ecftB0fciJOrbff1T0rTUPSbbHJDosdb0tvH/XoqHt7Q1ihTXdkfrQ5tkjmX XKVPsZFZcWwkS8zREMgh1UBmQSKLXDHYnFXZxsM+yh36qE/ytAhaiRsdgOlqFOl3P7/v KVvIcGW7bIiCuDJY2pJPvBD+h5WjXqNkg49cP8WCgRpkYSLFMkFKy1yTtS3AE9pOgZSK 69VGD9oNeMZ4sdwBjI6MvfEDPs0YhsmkeuHgPyoIich7pR21dw1FgTlFRR4SCGiR8KM9 JvPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723424482; x=1724029282; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TMzQ3ciSNyAJUT1sxzxGDbpLjSEaz3yLiVcKcHEYKY4=; b=adpS2O4HqzLt3NlA5pXBxZSM+lS/7PhjlxqdOH19k74KvcSn316GMfcpOPv7rzsQs2 jQN6ondidm6hkd5lJbzNCsKlCBM+1NpWhh49vlreiQL4rZJZ4HRuTeZ53DAbf98089nJ HkK7gJB5lkwhQ0LjLdxh4cBVq3eb1fNV0OY7cXVP/HqSNBKAkHqidMKyVxEF4Njll8cE aHwvhxxQp2JGQrSnCyN1dYEEokLcduD1zOole3vJzXL155gLDmN13S6WVdfz2CSr9gGW diedIg4VAkLXzyEfZSZddhhfos8OC5XyuiyQoy38HXzc3YopbIGYCaEbk4pLxWWFbfRS N6Bg== X-Forwarded-Encrypted: i=1; AJvYcCVs+wKMBFYozlaS9Kzc26SarMtmv8aU5BeUXDnVPEAVlEcT1WFYH54AwCzsBFt736IJMRMz/S4aYZhy6NvG8H4LpIMpwewpbpeWK1MZKJ4q X-Gm-Message-State: AOJu0Yx48d8ozhEodOcAkX5Sx0zCvirJnunn7U2FbpZyt82zO4heve75 6ct73xiPGWpsReKb7OnbOsKZ/PFWoJPqTDVO3AHj2jfLI6o2HEWSMjKPfqfXlr0= X-Google-Smtp-Source: AGHT+IHvjLsKNVgfioV52ZJQ6mkbTpTRo5xo8Ywht9O8CCjHZJ+ipOfWkzdibzywTZdRtlaqHgD09g== X-Received: by 2002:a05:6870:e38f:b0:261:2357:5a29 with SMTP id 586e51a60fabf-26c62f9f8admr6644942fac.46.1723424482033; Sun, 11 Aug 2024 18:01:22 -0700 (PDT) Received: from sunil-pc.tail07344b.ts.net ([106.51.198.16]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7c3dbe8cbdcsm3074062a12.61.2024.08.11.18.01.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Aug 2024 18:01:21 -0700 (PDT) From: Sunil V L To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-riscv@lists.infradead.org, linux-acpi@vger.kernel.org, acpica-devel@lists.linux.dev Subject: [PATCH v8 16/17] irqchip/riscv-aplic: Add ACPI support Date: Mon, 12 Aug 2024 06:29:28 +0530 Message-ID: <20240812005929.113499-17-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240812005929.113499-1-sunilvl@ventanamicro.com> References: <20240812005929.113499-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240811_180123_486963_6FF27231 X-CRM114-Status: GOOD ( 26.53 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Albert Ou , Haibo Xu , "Rafael J . Wysocki" , Anup Patel , Atish Kumar Patra , Robert Moore , Samuel Holland , Conor Dooley , Palmer Dabbelt , Drew Fustini , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Paul Walmsley , Bjorn Helgaas , Thomas Gleixner , Andrew Jones , Will Deacon , Len Brown Content-Type: text/plain; charset="cp1252" Content-Transfer-Encoding: base64 Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org QWRkIEFDUEkgc3VwcG9ydCBpbiBBUExJQyBkcml2ZXJzLiBVc2UgdGhlIG1hcHBpbmcgY3JlYXRl ZCBlYXJseSBkdXJpbmcKYm9vdCB0byBnZXQgdGhlIGRldGFpbHMgYWJvdXQgdGhlIEFQTElDLgoK U2lnbmVkLW9mZi1ieTogU3VuaWwgViBMIDxzdW5pbHZsQHZlbnRhbmFtaWNyby5jb20+ClJldmll d2VkLWJ5OiBBbnVwIFBhdGVsIDxhbnVwQGJyYWluZmF1bHQub3JnPgpUZXN0ZWQtYnk6IEJqw7Zy biBUw7ZwZWwgPGJqb3JuQHJpdm9zaW5jLmNvbT4KLS0tCiBkcml2ZXJzL2lycWNoaXAvaXJxLXJp c2N2LWFwbGljLWRpcmVjdC5jIHwgMjIgKysrKystLS0KIGRyaXZlcnMvaXJxY2hpcC9pcnEtcmlz Y3YtYXBsaWMtbWFpbi5jICAgfCA2OSArKysrKysrKysrKysrKysrLS0tLS0tLS0KIGRyaXZlcnMv aXJxY2hpcC9pcnEtcmlzY3YtYXBsaWMtbWFpbi5oICAgfCAgMSArCiBkcml2ZXJzL2lycWNoaXAv aXJxLXJpc2N2LWFwbGljLW1zaS5jICAgIHwgIDkgKysrLQogNCBmaWxlcyBjaGFuZ2VkLCA2OSBp bnNlcnRpb25zKCspLCAzMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2lycWNo aXAvaXJxLXJpc2N2LWFwbGljLWRpcmVjdC5jIGIvZHJpdmVycy9pcnFjaGlwL2lycS1yaXNjdi1h cGxpYy1kaXJlY3QuYwppbmRleCA0YTNmZmU4NTZkNmMuLjdjZDZiNjQ2Nzc0YiAxMDA2NDQKLS0t IGEvZHJpdmVycy9pcnFjaGlwL2lycS1yaXNjdi1hcGxpYy1kaXJlY3QuYworKysgYi9kcml2ZXJz L2lycWNoaXAvaXJxLXJpc2N2LWFwbGljLWRpcmVjdC5jCkBAIC00LDYgKzQsNyBAQAogICogQ29w eXJpZ2h0IChDKSAyMDIyIFZlbnRhbmEgTWljcm8gU3lzdGVtcyBJbmMuCiAgKi8KIAorI2luY2x1 ZGUgPGxpbnV4L2FjcGkuaD4KICNpbmNsdWRlIDxsaW51eC9iaXRmaWVsZC5oPgogI2luY2x1ZGUg PGxpbnV4L2JpdG9wcy5oPgogI2luY2x1ZGUgPGxpbnV4L2NwdS5oPgpAQCAtMTg5LDE3ICsxOTAs MjIgQEAgc3RhdGljIGludCBhcGxpY19kaXJlY3Rfc3RhcnRpbmdfY3B1KHVuc2lnbmVkIGludCBj cHUpCiB9CiAKIHN0YXRpYyBpbnQgYXBsaWNfZGlyZWN0X3BhcnNlX3BhcmVudF9od2lycShzdHJ1 Y3QgZGV2aWNlICpkZXYsIHUzMiBpbmRleCwKLQkJCQkJICAgdTMyICpwYXJlbnRfaHdpcnEsIHVu c2lnbmVkIGxvbmcgKnBhcmVudF9oYXJ0aWQpCisJCQkJCSAgIHUzMiAqcGFyZW50X2h3aXJxLCB1 bnNpZ25lZCBsb25nICpwYXJlbnRfaGFydGlkLAorCQkJCQkgICBzdHJ1Y3QgYXBsaWNfcHJpdiAq cHJpdikKIHsKIAlzdHJ1Y3Qgb2ZfcGhhbmRsZV9hcmdzIHBhcmVudDsKKwl1bnNpZ25lZCBsb25n IGhhcnRpZDsKIAlpbnQgcmM7CiAKLQkvKgotCSAqIEN1cnJlbnRseSwgb25seSBPRiBmd25vZGUg aXMgc3VwcG9ydGVkIHNvIGV4dGVuZCB0aGlzCi0JICogZnVuY3Rpb24gZm9yIEFDUEkgc3VwcG9y dC4KLQkgKi8KLQlpZiAoIWlzX29mX25vZGUoZGV2LT5md25vZGUpKQotCQlyZXR1cm4gLUVJTlZB TDsKKwlpZiAoIWlzX29mX25vZGUoZGV2LT5md25vZGUpKSB7CisJCWhhcnRpZCA9IGFjcGlfcmlu dGNfZXh0X3BhcmVudF90b19oYXJ0aWQocHJpdi0+YWNwaV9hcGxpY19pZCwgaW5kZXgpOworCQlp ZiAoaGFydGlkID09IElOVkFMSURfSEFSVElEKQorCQkJcmV0dXJuIC1FTk9ERVY7CisKKwkJKnBh cmVudF9oYXJ0aWQgPSBoYXJ0aWQ7CisJCSpwYXJlbnRfaHdpcnEgPSBSVl9JUlFfRVhUOworCQly ZXR1cm4gMDsKKwl9CiAKIAlyYyA9IG9mX2lycV9wYXJzZV9vbmUodG9fb2Zfbm9kZShkZXYtPmZ3 bm9kZSksIGluZGV4LCAmcGFyZW50KTsKIAlpZiAocmMpCkBAIC0yMzcsNyArMjQzLDcgQEAgaW50 IGFwbGljX2RpcmVjdF9zZXR1cChzdHJ1Y3QgZGV2aWNlICpkZXYsIHZvaWQgX19pb21lbSAqcmVn cykKIAkvKiBTZXR1cCBwZXItQ1BVIElEQyBhbmQgdGFyZ2V0IENQVSBtYXNrICovCiAJY3VycmVu dF9jcHUgPSBnZXRfY3B1KCk7CiAJZm9yIChpID0gMDsgaSA8IHByaXYtPm5yX2lkY3M7IGkrKykg ewotCQlyYyA9IGFwbGljX2RpcmVjdF9wYXJzZV9wYXJlbnRfaHdpcnEoZGV2LCBpLCAmaHdpcnEs ICZoYXJ0aWQpOworCQlyYyA9IGFwbGljX2RpcmVjdF9wYXJzZV9wYXJlbnRfaHdpcnEoZGV2LCBp LCAmaHdpcnEsICZoYXJ0aWQsIHByaXYpOwogCQlpZiAocmMpIHsKIAkJCWRldl93YXJuKGRldiwg InBhcmVudCBpcnEgZm9yIElEQyVkIG5vdCBmb3VuZFxuIiwgaSk7CiAJCQljb250aW51ZTsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvaXJxY2hpcC9pcnEtcmlzY3YtYXBsaWMtbWFpbi5jIGIvZHJpdmVy cy9pcnFjaGlwL2lycS1yaXNjdi1hcGxpYy1tYWluLmMKaW5kZXggMjhkZDE3NWI1NzY0Li5jYmU5 Nzg4NjM2NGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvaXJxY2hpcC9pcnEtcmlzY3YtYXBsaWMtbWFp bi5jCisrKyBiL2RyaXZlcnMvaXJxY2hpcC9pcnEtcmlzY3YtYXBsaWMtbWFpbi5jCkBAIC00LDgg KzQsMTAgQEAKICAqIENvcHlyaWdodCAoQykgMjAyMiBWZW50YW5hIE1pY3JvIFN5c3RlbXMgSW5j LgogICovCiAKKyNpbmNsdWRlIDxsaW51eC9hY3BpLmg+CiAjaW5jbHVkZSA8bGludXgvYml0Zmll bGQuaD4KICNpbmNsdWRlIDxsaW51eC9pcnFjaGlwL3Jpc2N2LWFwbGljLmg+CisjaW5jbHVkZSA8 bGludXgvaXJxY2hpcC9yaXNjdi1pbXNpYy5oPgogI2luY2x1ZGUgPGxpbnV4L21vZHVsZS5oPgog I2luY2x1ZGUgPGxpbnV4L29mLmg+CiAjaW5jbHVkZSA8bGludXgvb2ZfaXJxLmg+CkBAIC0xMjUs MzkgKzEyNyw1MCBAQCBzdGF0aWMgdm9pZCBhcGxpY19pbml0X2h3X2lycXMoc3RydWN0IGFwbGlj X3ByaXYgKnByaXYpCiAJd3JpdGVsKDAsIHByaXYtPnJlZ3MgKyBBUExJQ19ET01BSU5DRkcpOwog fQogCisjaWZkZWYgQ09ORklHX0FDUEkKK3N0YXRpYyBjb25zdCBzdHJ1Y3QgYWNwaV9kZXZpY2Vf aWQgYXBsaWNfYWNwaV9tYXRjaFtdID0geworCXsgIlJTQ1YwMDAyIiwgMCB9LAorCXt9Cit9Owor TU9EVUxFX0RFVklDRV9UQUJMRShhY3BpLCBhcGxpY19hY3BpX21hdGNoKTsKKworI2VuZGlmCisK IGludCBhcGxpY19zZXR1cF9wcml2KHN0cnVjdCBhcGxpY19wcml2ICpwcml2LCBzdHJ1Y3QgZGV2 aWNlICpkZXYsIHZvaWQgX19pb21lbSAqcmVncykKIHsKIAlzdHJ1Y3QgZGV2aWNlX25vZGUgKm5w ID0gdG9fb2Zfbm9kZShkZXYtPmZ3bm9kZSk7CiAJc3RydWN0IG9mX3BoYW5kbGVfYXJncyBwYXJl bnQ7CiAJaW50IHJjOwogCi0JLyoKLQkgKiBDdXJyZW50bHksIG9ubHkgT0YgZndub2RlIGlzIHN1 cHBvcnRlZCBzbyBleHRlbmQgdGhpcwotCSAqIGZ1bmN0aW9uIGZvciBBQ1BJIHN1cHBvcnQuCi0J ICovCi0JaWYgKCFucCkKLQkJcmV0dXJuIC1FSU5WQUw7Ci0KIAkvKiBTYXZlIGRldmljZSBwb2lu dGVyIGFuZCByZWdpc3RlciBiYXNlICovCiAJcHJpdi0+ZGV2ID0gZGV2OwogCXByaXYtPnJlZ3Mg PSByZWdzOwogCi0JLyogRmluZCBvdXQgbnVtYmVyIG9mIGludGVycnVwdCBzb3VyY2VzICovCi0J cmMgPSBvZl9wcm9wZXJ0eV9yZWFkX3UzMihucCwgInJpc2N2LG51bS1zb3VyY2VzIiwgJnByaXYt Pm5yX2lycXMpOwotCWlmIChyYykgewotCQlkZXZfZXJyKGRldiwgImZhaWxlZCB0byBnZXQgbnVt YmVyIG9mIGludGVycnVwdCBzb3VyY2VzXG4iKTsKLQkJcmV0dXJuIHJjOwotCX0KKwlpZiAobnAp IHsKKwkJLyogRmluZCBvdXQgbnVtYmVyIG9mIGludGVycnVwdCBzb3VyY2VzICovCisJCXJjID0g b2ZfcHJvcGVydHlfcmVhZF91MzIobnAsICJyaXNjdixudW0tc291cmNlcyIsICZwcml2LT5ucl9p cnFzKTsKKwkJaWYgKHJjKSB7CisJCQlkZXZfZXJyKGRldiwgImZhaWxlZCB0byBnZXQgbnVtYmVy IG9mIGludGVycnVwdCBzb3VyY2VzXG4iKTsKKwkJCXJldHVybiByYzsKKwkJfQogCi0JLyoKLQkg KiBGaW5kIG91dCBudW1iZXIgb2YgSURDcyBiYXNlZCBvbiBwYXJlbnQgaW50ZXJydXB0cwotCSAq Ci0JICogSWYgIm1zaS1wYXJlbnQiIHByb3BlcnR5IGlzIHByZXNlbnQgdGhlbiB3ZSBpZ25vcmUg dGhlCi0JICogQVBMSUMgSURDcyB3aGljaCBmb3JjZXMgdGhlIEFQTElDIGRyaXZlciB0byB1c2Ug TVNJIG1vZGUuCi0JICovCi0JaWYgKCFvZl9wcm9wZXJ0eV9wcmVzZW50KG5wLCAibXNpLXBhcmVu dCIpKSB7Ci0JCXdoaWxlICghb2ZfaXJxX3BhcnNlX29uZShucCwgcHJpdi0+bnJfaWRjcywgJnBh cmVudCkpCi0JCQlwcml2LT5ucl9pZGNzKys7CisJCS8qCisJCSAqIEZpbmQgb3V0IG51bWJlciBv ZiBJRENzIGJhc2VkIG9uIHBhcmVudCBpbnRlcnJ1cHRzCisJCSAqCisJCSAqIElmICJtc2ktcGFy ZW50IiBwcm9wZXJ0eSBpcyBwcmVzZW50IHRoZW4gd2UgaWdub3JlIHRoZQorCQkgKiBBUExJQyBJ RENzIHdoaWNoIGZvcmNlcyB0aGUgQVBMSUMgZHJpdmVyIHRvIHVzZSBNU0kgbW9kZS4KKwkJICov CisJCWlmICghb2ZfcHJvcGVydHlfcHJlc2VudChucCwgIm1zaS1wYXJlbnQiKSkgeworCQkJd2hp bGUgKCFvZl9pcnFfcGFyc2Vfb25lKG5wLCBwcml2LT5ucl9pZGNzLCAmcGFyZW50KSkKKwkJCQlw cml2LT5ucl9pZGNzKys7CisJCX0KKwl9IGVsc2UgeworCQlyYyA9IHJpc2N2X2FjcGlfZ2V0X2dz aV9pbmZvKGRldi0+Zndub2RlLCAmcHJpdi0+Z3NpX2Jhc2UsICZwcml2LT5hY3BpX2FwbGljX2lk LAorCQkJCQkgICAgICZwcml2LT5ucl9pcnFzLCAmcHJpdi0+bnJfaWRjcyk7CisJCWlmIChyYykg eworCQkJZGV2X2VycihkZXYsICJmYWlsZWQgdG8gZmluZCBHU0kgbWFwcGluZ1xuIik7CisJCQly ZXR1cm4gcmM7CisJCX0KIAl9CiAKIAkvKiBTZXR1cCBpbml0aWFsIHN0YXRlIEFQTElDIGludGVy cnVwdHMgKi8KQEAgLTE4NCw3ICsxOTcsMTEgQEAgc3RhdGljIGludCBhcGxpY19wcm9iZShzdHJ1 Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogCSAqIElmIG1zaS1wYXJlbnQgcHJvcGVydHkgaXMg cHJlc2VudCB0aGVuIHNldHVwIEFQTElDIE1TSQogCSAqIG1vZGUgb3RoZXJ3aXNlIHNldHVwIEFQ TElDIGRpcmVjdCBtb2RlLgogCSAqLwotCW1zaV9tb2RlID0gb2ZfcHJvcGVydHlfcHJlc2VudCh0 b19vZl9ub2RlKGRldi0+Zndub2RlKSwgIm1zaS1wYXJlbnQiKTsKKwlpZiAoaXNfb2Zfbm9kZShk ZXYtPmZ3bm9kZSkpCisJCW1zaV9tb2RlID0gb2ZfcHJvcGVydHlfcHJlc2VudCh0b19vZl9ub2Rl KGRldi0+Zndub2RlKSwgIm1zaS1wYXJlbnQiKTsKKwllbHNlCisJCW1zaV9tb2RlID0gaW1zaWNf YWNwaV9nZXRfZndub2RlKE5VTEwpID8gMSA6IDA7CisKIAlpZiAobXNpX21vZGUpCiAJCXJjID0g YXBsaWNfbXNpX3NldHVwKGRldiwgcmVncyk7CiAJZWxzZQpAQCAtMTkyLDYgKzIwOSwxMSBAQCBz dGF0aWMgaW50IGFwbGljX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJaWYg KHJjKQogCQlkZXZfZXJyKGRldiwgImZhaWxlZCB0byBzZXR1cCBBUExJQyBpbiAlcyBtb2RlXG4i LCBtc2lfbW9kZSA/ICJNU0kiIDogImRpcmVjdCIpOwogCisjaWZkZWYgQ09ORklHX0FDUEkKKwlp ZiAoIWFjcGlfZGlzYWJsZWQpCisJCWFjcGlfZGV2X2NsZWFyX2RlcGVuZGVuY2llcyhBQ1BJX0NP TVBBTklPTihkZXYpKTsKKyNlbmRpZgorCiAJcmV0dXJuIHJjOwogfQogCkBAIC0yMDQsNiArMjI2 LDcgQEAgc3RhdGljIHN0cnVjdCBwbGF0Zm9ybV9kcml2ZXIgYXBsaWNfZHJpdmVyID0gewogCS5k cml2ZXIgPSB7CiAJCS5uYW1lCQk9ICJyaXNjdi1hcGxpYyIsCiAJCS5vZl9tYXRjaF90YWJsZQk9 IGFwbGljX21hdGNoLAorCQkuYWNwaV9tYXRjaF90YWJsZSA9IEFDUElfUFRSKGFwbGljX2FjcGlf bWF0Y2gpLAogCX0sCiAJLnByb2JlID0gYXBsaWNfcHJvYmUsCiB9OwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9pcnFjaGlwL2lycS1yaXNjdi1hcGxpYy1tYWluLmggYi9kcml2ZXJzL2lycWNoaXAvaXJx LXJpc2N2LWFwbGljLW1haW4uaAppbmRleCA0MzkzOTI3ZDhjODAuLmIwYWQ4Y2RlNjliMSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9pcnFjaGlwL2lycS1yaXNjdi1hcGxpYy1tYWluLmgKKysrIGIvZHJp dmVycy9pcnFjaGlwL2lycS1yaXNjdi1hcGxpYy1tYWluLmgKQEAgLTI4LDYgKzI4LDcgQEAgc3Ry dWN0IGFwbGljX3ByaXYgewogCXUzMgkJCWdzaV9iYXNlOwogCXUzMgkJCW5yX2lycXM7CiAJdTMy CQkJbnJfaWRjczsKKwl1MzIJCQlhY3BpX2FwbGljX2lkOwogCXZvaWQgX19pb21lbQkJKnJlZ3M7 CiAJc3RydWN0IGFwbGljX21zaWNmZwltc2ljZmc7CiB9OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9p cnFjaGlwL2lycS1yaXNjdi1hcGxpYy1tc2kuYyBiL2RyaXZlcnMvaXJxY2hpcC9pcnEtcmlzY3Yt YXBsaWMtbXNpLmMKaW5kZXggZDc3NzNmNzZlNWQwLi45NDViZmYyODI2NWMgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvaXJxY2hpcC9pcnEtcmlzY3YtYXBsaWMtbXNpLmMKKysrIGIvZHJpdmVycy9pcnFj aGlwL2lycS1yaXNjdi1hcGxpYy1tc2kuYwpAQCAtMTc1LDYgKzE3NSw3IEBAIHN0YXRpYyBjb25z dCBzdHJ1Y3QgbXNpX2RvbWFpbl90ZW1wbGF0ZSBhcGxpY19tc2lfdGVtcGxhdGUgPSB7CiBpbnQg YXBsaWNfbXNpX3NldHVwKHN0cnVjdCBkZXZpY2UgKmRldiwgdm9pZCBfX2lvbWVtICpyZWdzKQog ewogCWNvbnN0IHN0cnVjdCBpbXNpY19nbG9iYWxfY29uZmlnICppbXNpY19nbG9iYWw7CisJc3Ry dWN0IGlycV9kb21haW4gKm1zaV9kb21haW47CiAJc3RydWN0IGFwbGljX3ByaXYgKnByaXY7CiAJ c3RydWN0IGFwbGljX21zaWNmZyAqbWM7CiAJcGh5c19hZGRyX3QgcGE7CkBAIC0yNTcsOCArMjU4 LDE0IEBAIGludCBhcGxpY19tc2lfc2V0dXAoc3RydWN0IGRldmljZSAqZGV2LCB2b2lkIF9faW9t ZW0gKnJlZ3MpCiAJCSAqIElNU0lDIGFuZCB0aGUgSU1TSUMgTVNJIGRvbWFpbnMgYXJlIGNyZWF0 ZWQgbGF0ZXIgdGhyb3VnaAogCQkgKiB0aGUgcGxhdGZvcm0gZHJpdmVyIHByb2Jpbmcgc28gd2Ug c2V0IGl0IGV4cGxpY2l0bHkgaGVyZS4KIAkJICovCi0JCWlmIChpc19vZl9ub2RlKGRldi0+Zndu b2RlKSkKKwkJaWYgKGlzX29mX25vZGUoZGV2LT5md25vZGUpKSB7CiAJCQlvZl9tc2lfY29uZmln dXJlKGRldiwgdG9fb2Zfbm9kZShkZXYtPmZ3bm9kZSkpOworCQl9IGVsc2UgeworCQkJbXNpX2Rv bWFpbiA9IGlycV9maW5kX21hdGNoaW5nX2Z3bm9kZShpbXNpY19hY3BpX2dldF9md25vZGUoZGV2 KSwKKwkJCQkJCQkgICAgICBET01BSU5fQlVTX1BMQVRGT1JNX01TSSk7CisJCQlpZiAobXNpX2Rv bWFpbikKKwkJCQlkZXZfc2V0X21zaV9kb21haW4oZGV2LCBtc2lfZG9tYWluKTsKKwkJfQogCX0K IAogCWlmICghbXNpX2NyZWF0ZV9kZXZpY2VfaXJxX2RvbWFpbihkZXYsIE1TSV9ERUZBVUxUX0RP TUFJTiwgJmFwbGljX21zaV90ZW1wbGF0ZSwKLS0gCjIuNDMuMAoKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LXJpc2N2IG1haWxpbmcgbGlzdAps aW51eC1yaXNjdkBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3Jn L21haWxtYW4vbGlzdGluZm8vbGludXgtcmlzY3YK