From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-io1-f53.google.com (mail-io1-f53.google.com [209.85.166.53]) (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 6600F7C6E6 for ; Mon, 12 Aug 2024 01:01:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723424491; cv=none; b=oHbPIJoR6DIq24K52rG754svgHRvFyOQh7QSbQWjaK47jrYQ4Uimn2ZjOTp95Hpt264M+PI7cR9Inyd6DQkafqoCinjzllAzQHLaUJ/PzLB7tKq70y/MrX65DWzejlLKic1OdmxQ/NZD9JVw2/p/AIiVskkVGxoJpCQtbhvb58g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723424491; c=relaxed/simple; bh=jjQu2jdS/HNK9a4N33zsmxheaJY85iZag0mOYvZYXqs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SHIAC1S4wPhHFD44ZsaWFbCkDmPMX+wLnp6uO5hf4ovEIkZEPRplPwzWb09QZLPs9qzLTuX2cwBkqP6Wrl3TwS0MV6jLHH73XqMdiidtkb6fWcQZ5PASwKlTuZjJ1lvl22FZYyyYBPTyyR/wc8pSzDYpbOuDy/kNGerwyQjAk4Y= 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=KAVqdsjZ; arc=none smtp.client-ip=209.85.166.53 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="KAVqdsjZ" Received: by mail-io1-f53.google.com with SMTP id ca18e2360f4ac-81fd520fee5so150370139f.2 for ; Sun, 11 Aug 2024 18:01:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1723424488; x=1724029288; 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=cNLSK7wTLWm4CwE5KqZAhFa5+nxzSyIB3H2xsiVowu8=; b=KAVqdsjZu2J36NqInBNDOB6AuJCa9yfcA5+PBiIp5AZ85nDP32zIeBgPAvvNLefVWm 6rDwB+zZh1ZFDc9giLIOaDAaNtpyhknKDz2L/FGSMecEeG42Q6j2T7QMTO5soWHta2Sz fywecjylliHZSXoz9Be9OXmGzyWG2Qm0dlUcEvH89w/MlxVqTrQfIjxg26HXWefQmvXT SWjIyzHHXgo78HM2lMW3x1h/hfeJV/e7CDjPGNDzs1rXQimgCtVWITk2zE9Zgz7luw7o O7eeIS2jENWsPoI8PW7JxwCYKdnBi+EGbhFjGhRdjnDbOnjTr7L2k7cRUssxwhu/sPli joSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723424488; x=1724029288; 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=cNLSK7wTLWm4CwE5KqZAhFa5+nxzSyIB3H2xsiVowu8=; b=U2Ji3sq/LS5iHrgjf4Z1mi80NeLEh96IpQQttcucFuCy29qL5WyzObAWyAVbUqNtQN Mf+jztB60H1E14UkhxulUpqsIcPUL42qQ1FT/7iVWiRM8f6L5Go0Y6+x4lQfDhEeUHAa n1ai+SEk95EdjHEbbci5kwPVoXTlXrVXK89xnvaLs1DK89lheOOuhQvzHZTpqDUImKWN Uibxx891bimVnus5LuSN6ddd2XtKzhxqkwY3Id+yrmQ/T0eWh+ixLfSiZMi3QKvQow1g Ce9AijG/yBVCSQ0EcqAKquqxxWiPt5AkKnKMQbpBQpogHcFe6n41VDhsiDQY+enyV7kK h57g== X-Forwarded-Encrypted: i=1; AJvYcCWe3jDl8FvepM9elCHCffMoUW9jhUdPEtg+xl8TexD6VumINrjpSZ3l1lJToCACPRdvnN1dsNvTNBXO6pMhVX8kF6aguu8/9zDyrCee X-Gm-Message-State: AOJu0Ywl8JPtq10g+icpIMajvwSOEAjjOHmSKWzdjusay0s8W7aU16B3 e08idIk+R9fganwKAcHQxGDeelss4zM7vq7Fn9v7jYnCy4at+jv0J2g3b62qCsw= X-Google-Smtp-Source: AGHT+IF383Ow04ACkTQv23O0jExDAeidajffTjgaukCfUfErQcvrXz/vXlnALl3G0O0SzK4yssEykg== X-Received: by 2002:a05:6602:15d3:b0:805:3d47:19cf with SMTP id ca18e2360f4ac-8225eedb1e2mr1121775039f.15.1723424488343; Sun, 11 Aug 2024 18:01:28 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Aug 2024 18:01:27 -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 17/17] irqchip/sifive-plic: Add ACPI support Date: Mon, 12 Aug 2024 06:29:29 +0530 Message-ID: <20240812005929.113499-18-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 PLIC driver. Use the mapping created early during boot to get details about the PLIC. Signed-off-by: Sunil V L Co-developed-by: Haibo Xu Signed-off-by: Haibo Xu Reviewed-by: Anup Patel Tested-by: Björn Töpel --- drivers/irqchip/irq-sifive-plic.c | 95 ++++++++++++++++++++++++------- 1 file changed, 74 insertions(+), 21 deletions(-) diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive-plic.c index 9e22f7e378f5..207cfe18ec7f 100644 --- a/drivers/irqchip/irq-sifive-plic.c +++ b/drivers/irqchip/irq-sifive-plic.c @@ -3,6 +3,7 @@ * Copyright (C) 2017 SiFive * Copyright (C) 2018 Christoph Hellwig */ +#include #include #include #include @@ -70,6 +71,8 @@ struct plic_priv { unsigned long plic_quirks; unsigned int nr_irqs; unsigned long *prio_save; + u32 gsi_base; + int acpi_plic_id; }; struct plic_handler { @@ -324,6 +327,10 @@ static int plic_irq_domain_translate(struct irq_domain *d, { struct plic_priv *priv = d->host_data; + /* For DT, gsi_base is always zero. */ + if (fwspec->param[0] >= priv->gsi_base) + fwspec->param[0] = fwspec->param[0] - priv->gsi_base; + if (test_bit(PLIC_QUIRK_EDGE_INTERRUPT, &priv->plic_quirks)) return irq_domain_translate_twocell(d, fwspec, hwirq, type); @@ -424,18 +431,37 @@ static const struct of_device_id plic_match[] = { {} }; +#ifdef CONFIG_ACPI + +static const struct acpi_device_id plic_acpi_match[] = { + { "RSCV0001", 0 }, + {} +}; +MODULE_DEVICE_TABLE(acpi, plic_acpi_match); + +#endif static int plic_parse_nr_irqs_and_contexts(struct platform_device *pdev, - u32 *nr_irqs, u32 *nr_contexts) + u32 *nr_irqs, u32 *nr_contexts, + u32 *gsi_base, u32 *id) { struct device *dev = &pdev->dev; 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)) { + rc = riscv_acpi_get_gsi_info(dev->fwnode, gsi_base, id, nr_irqs, NULL); + if (rc) { + dev_err(dev, "failed to find GSI mapping\n"); + return rc; + } + + *nr_contexts = acpi_rintc_get_plic_nr_contexts(*id); + if (WARN_ON(!*nr_contexts)) { + dev_err(dev, "no PLIC context available\n"); + return -EINVAL; + } + + return 0; + } rc = of_property_read_u32(to_of_node(dev->fwnode), "riscv,ndev", nr_irqs); if (rc) { @@ -449,23 +475,29 @@ static int plic_parse_nr_irqs_and_contexts(struct platform_device *pdev, return -EINVAL; } + *gsi_base = 0; + *id = 0; + return 0; } static int plic_parse_context_parent(struct platform_device *pdev, u32 context, - u32 *parent_hwirq, int *parent_cpu) + u32 *parent_hwirq, int *parent_cpu, u32 id) { struct device *dev = &pdev->dev; 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(id, context); + if (hartid == INVALID_HARTID) + return -EINVAL; + + *parent_cpu = riscv_hartid_to_cpuid(hartid); + *parent_hwirq = RV_IRQ_EXT; + return 0; + } rc = of_irq_parse_one(to_of_node(dev->fwnode), context, &parent); if (rc) @@ -489,6 +521,8 @@ static int plic_probe(struct platform_device *pdev) u32 nr_irqs, parent_hwirq; struct plic_priv *priv; irq_hw_number_t hwirq; + int id, context_id; + u32 gsi_base; if (is_of_node(dev->fwnode)) { const struct of_device_id *id; @@ -498,7 +532,7 @@ static int plic_probe(struct platform_device *pdev) plic_quirks = (unsigned long)id->data; } - error = plic_parse_nr_irqs_and_contexts(pdev, &nr_irqs, &nr_contexts); + error = plic_parse_nr_irqs_and_contexts(pdev, &nr_irqs, &nr_contexts, &gsi_base, &id); if (error) return error; @@ -509,6 +543,8 @@ static int plic_probe(struct platform_device *pdev) priv->dev = dev; priv->plic_quirks = plic_quirks; priv->nr_irqs = nr_irqs; + priv->gsi_base = gsi_base; + priv->acpi_plic_id = id; priv->regs = devm_platform_ioremap_resource(pdev, 0); if (WARN_ON(!priv->regs)) @@ -519,12 +555,23 @@ static int plic_probe(struct platform_device *pdev) return -ENOMEM; for (i = 0; i < nr_contexts; i++) { - error = plic_parse_context_parent(pdev, i, &parent_hwirq, &cpu); + error = plic_parse_context_parent(pdev, i, &parent_hwirq, &cpu, + priv->acpi_plic_id); if (error) { dev_warn(dev, "hwirq for context%d not found\n", i); continue; } + if (is_of_node(dev->fwnode)) { + context_id = i; + } else { + context_id = acpi_rintc_get_plic_context(priv->acpi_plic_id, i); + if (context_id == INVALID_CONTEXT) { + dev_warn(dev, "invalid context id for context%d\n", i); + continue; + } + } + /* * Skip contexts other than external interrupts for our * privilege level. @@ -562,10 +609,10 @@ static int plic_probe(struct platform_device *pdev) cpumask_set_cpu(cpu, &priv->lmask); handler->present = true; handler->hart_base = priv->regs + CONTEXT_BASE + - i * CONTEXT_SIZE; + context_id * CONTEXT_SIZE; raw_spin_lock_init(&handler->enable_lock); handler->enable_base = priv->regs + CONTEXT_ENABLE_BASE + - i * CONTEXT_ENABLE_SIZE; + context_id * CONTEXT_ENABLE_SIZE; handler->priv = priv; handler->enable_save = devm_kcalloc(dev, DIV_ROUND_UP(nr_irqs, 32), @@ -581,8 +628,8 @@ static int plic_probe(struct platform_device *pdev) nr_handlers++; } - priv->irqdomain = irq_domain_add_linear(to_of_node(dev->fwnode), nr_irqs + 1, - &plic_irqdomain_ops, priv); + priv->irqdomain = irq_domain_create_linear(dev->fwnode, nr_irqs + 1, + &plic_irqdomain_ops, priv); if (WARN_ON(!priv->irqdomain)) goto fail_cleanup_contexts; @@ -619,13 +666,18 @@ static int plic_probe(struct platform_device *pdev) } } +#ifdef CONFIG_ACPI + if (!acpi_disabled) + acpi_dev_clear_dependencies(ACPI_COMPANION(dev)); +#endif + dev_info(dev, "mapped %d interrupts with %d handlers for %d contexts.\n", nr_irqs, nr_handlers, nr_contexts); return 0; fail_cleanup_contexts: for (i = 0; i < nr_contexts; i++) { - if (plic_parse_context_parent(pdev, i, &parent_hwirq, &cpu)) + if (plic_parse_context_parent(pdev, i, &parent_hwirq, &cpu, priv->acpi_plic_id)) continue; if (parent_hwirq != RV_IRQ_EXT || cpu < 0) continue; @@ -644,6 +696,7 @@ static struct platform_driver plic_driver = { .driver = { .name = "riscv-plic", .of_match_table = plic_match, + .acpi_match_table = ACPI_PTR(plic_acpi_match), }, .probe = plic_probe, }; -- 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 E6B69C3DA4A for ; Mon, 12 Aug 2024 01:09:41 +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=LY+R+acWHjUir0esPH929+XLrdawAIqnSD3k5f7mMZ8=; b=2LAwqg4LUsQB9a z0wfH6GXNoV4MjT+2Vd5f7RaYDZ/BHj8KRjv8P84j2Mv0GxvwqMyLTBJfbV6n/C4PNI2bORijSyAm TILdWaknx1Ums12/BWRgBZkThxeabGFdzn+EC+U5jJyVckJnS7ijIxySlfFjdgdZJ2okF0FFs/hi5 71xXfo+R0iGfuy/nMd/7uVBEcmLmJya5bvL0Cj4brFkt8s3mxcwa48iv2SDwUrcHSq02dkwbELU/p /pWt7Xneyqi8n39g21AqBaWpelqF+ECrRzSZK7rAo+UnnYFfctNwABAMMKy3XCNeVETil8pDA98j0 nGmuHrrync2adglYex6g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sdJZ5-0000000GcZY-2l4y; Mon, 12 Aug 2024 01:09:39 +0000 Received: from mail-io1-xd34.google.com ([2607:f8b0:4864:20::d34]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sdJRB-0000000GaZa-3lsd for linux-riscv@lists.infradead.org; Mon, 12 Aug 2024 01:01:31 +0000 Received: by mail-io1-xd34.google.com with SMTP id ca18e2360f4ac-81fd520fee5so150369939f.2 for ; Sun, 11 Aug 2024 18:01:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1723424488; x=1724029288; 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=cNLSK7wTLWm4CwE5KqZAhFa5+nxzSyIB3H2xsiVowu8=; b=j9mDL31umRy5/i5Il/niqtlUP/t05RK+Bg6z+SoIMJ62vtjxH1uUgPldeO3oIDAbMm NJdsZNilPBO3udJRh5JYMi/Da7uk9aaDQZme82XrfXc50Xj493KKLrySQUGWLzQZLFz1 T//z5k/F/woHXB2jnDircpeam3WeTsWMJwmrGQicyuIDRlycPJtAmGUsMHOD9JKnSIRh eBsuxumqO/gmQwqumOfjS2hXmcw+xjLaGyBhMf6sE5BCFGP0paxOS550CDJkaGs+GExH R3/e2+phzWHHKRUXgGAYR/esw/qFuG2OOH1pvKDfKuQwJpzErhEZvQf0cJXFy/kGKPNm ugiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723424488; x=1724029288; 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=cNLSK7wTLWm4CwE5KqZAhFa5+nxzSyIB3H2xsiVowu8=; b=T5P1cvvRdtNq+NT64BZjzm2t0vro9VcuI2/rLTvAhXU5t9sxzHqqyireAtA9Mujish CGbe17Csx5F0GBaBKyu5xvFl0btJUBQN+OyjrDzNYt+Wvb/Igk5WaSEB/qv4sSzs+wNv s66sByASYa/NhJ7rPJPnw9EvRIFO4Pf2eiuvawDWEMqKIBkgfWtV/WKKHAt4kmsWtbFP 8Y/KP0kFDGggR/vVriDgl7FYN27lHMcHvVlq33zpR+9Qx2E7p2NX2mUq6Sa6gOgMrSi3 xBgTDL/AEOPkVPRUa4rnM8gz3G7qunB7kCxpnuxrW7t6WO/0E6QTGI9oVbpbjY4kPJV7 3yrg== X-Forwarded-Encrypted: i=1; AJvYcCVXIjb1P5ZOBTlnucVri0MrohN0lrGap9G8a7EtVbXfGi/ZrEFAYyD5KrDP6NHlAdIPO+npRxx5DciZLxuFABRWQYbfJJPGzr6/fAAjFoiW X-Gm-Message-State: AOJu0Yw1ijvy9OQ3j4pBBu4mEeJ1dWvj193LUh2K6Cw5FL/bT3Qy5MTx RbnUdCkiGPQKxjT5p4kiQcxz9B5/RySRKrTsYDYlR+euvH62qCfE7uFEtpAKetw= X-Google-Smtp-Source: AGHT+IF383Ow04ACkTQv23O0jExDAeidajffTjgaukCfUfErQcvrXz/vXlnALl3G0O0SzK4yssEykg== X-Received: by 2002:a05:6602:15d3:b0:805:3d47:19cf with SMTP id ca18e2360f4ac-8225eedb1e2mr1121775039f.15.1723424488343; Sun, 11 Aug 2024 18:01:28 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Aug 2024 18:01:27 -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 17/17] irqchip/sifive-plic: Add ACPI support Date: Mon, 12 Aug 2024 06:29:29 +0530 Message-ID: <20240812005929.113499-18-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_180130_002857_22016B84 X-CRM114-Status: GOOD ( 22.36 ) 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 QWRkIEFDUEkgc3VwcG9ydCBpbiBQTElDIGRyaXZlci4gVXNlIHRoZSBtYXBwaW5nIGNyZWF0ZWQg ZWFybHkgZHVyaW5nCmJvb3QgdG8gZ2V0IGRldGFpbHMgYWJvdXQgdGhlIFBMSUMuCgpTaWduZWQt b2ZmLWJ5OiBTdW5pbCBWIEwgPHN1bmlsdmxAdmVudGFuYW1pY3JvLmNvbT4KQ28tZGV2ZWxvcGVk LWJ5OiBIYWlibyBYdSA8aGFpYm8xLnh1QGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogSGFpYm8g WHUgPGhhaWJvMS54dUBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBBbnVwIFBhdGVsIDxhbnVwQGJy YWluZmF1bHQub3JnPgpUZXN0ZWQtYnk6IEJqw7ZybiBUw7ZwZWwgPGJqb3JuQHJpdm9zaW5jLmNv bT4KLS0tCiBkcml2ZXJzL2lycWNoaXAvaXJxLXNpZml2ZS1wbGljLmMgfCA5NSArKysrKysrKysr KysrKysrKysrKysrKystLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNzQgaW5zZXJ0aW9ucygrKSwg MjEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9pcnFjaGlwL2lycS1zaWZpdmUt cGxpYy5jIGIvZHJpdmVycy9pcnFjaGlwL2lycS1zaWZpdmUtcGxpYy5jCmluZGV4IDllMjJmN2Uz NzhmNS4uMjA3Y2ZlMThlYzdmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2lycWNoaXAvaXJxLXNpZml2 ZS1wbGljLmMKKysrIGIvZHJpdmVycy9pcnFjaGlwL2lycS1zaWZpdmUtcGxpYy5jCkBAIC0zLDYg KzMsNyBAQAogICogQ29weXJpZ2h0IChDKSAyMDE3IFNpRml2ZQogICogQ29weXJpZ2h0IChDKSAy MDE4IENocmlzdG9waCBIZWxsd2lnCiAgKi8KKyNpbmNsdWRlIDxsaW51eC9hY3BpLmg+CiAjaW5j bHVkZSA8bGludXgvY3B1Lmg+CiAjaW5jbHVkZSA8bGludXgvaW50ZXJydXB0Lmg+CiAjaW5jbHVk ZSA8bGludXgvaW8uaD4KQEAgLTcwLDYgKzcxLDggQEAgc3RydWN0IHBsaWNfcHJpdiB7CiAJdW5z aWduZWQgbG9uZyBwbGljX3F1aXJrczsKIAl1bnNpZ25lZCBpbnQgbnJfaXJxczsKIAl1bnNpZ25l ZCBsb25nICpwcmlvX3NhdmU7CisJdTMyIGdzaV9iYXNlOworCWludCBhY3BpX3BsaWNfaWQ7CiB9 OwogCiBzdHJ1Y3QgcGxpY19oYW5kbGVyIHsKQEAgLTMyNCw2ICszMjcsMTAgQEAgc3RhdGljIGlu dCBwbGljX2lycV9kb21haW5fdHJhbnNsYXRlKHN0cnVjdCBpcnFfZG9tYWluICpkLAogewogCXN0 cnVjdCBwbGljX3ByaXYgKnByaXYgPSBkLT5ob3N0X2RhdGE7CiAKKwkvKiBGb3IgRFQsIGdzaV9i YXNlIGlzIGFsd2F5cyB6ZXJvLiAqLworCWlmIChmd3NwZWMtPnBhcmFtWzBdID49IHByaXYtPmdz aV9iYXNlKQorCQlmd3NwZWMtPnBhcmFtWzBdID0gZndzcGVjLT5wYXJhbVswXSAtIHByaXYtPmdz aV9iYXNlOworCiAJaWYgKHRlc3RfYml0KFBMSUNfUVVJUktfRURHRV9JTlRFUlJVUFQsICZwcml2 LT5wbGljX3F1aXJrcykpCiAJCXJldHVybiBpcnFfZG9tYWluX3RyYW5zbGF0ZV90d29jZWxsKGQs IGZ3c3BlYywgaHdpcnEsIHR5cGUpOwogCkBAIC00MjQsMTggKzQzMSwzNyBAQCBzdGF0aWMgY29u c3Qgc3RydWN0IG9mX2RldmljZV9pZCBwbGljX21hdGNoW10gPSB7CiAJe30KIH07CiAKKyNpZmRl ZiBDT05GSUdfQUNQSQorCitzdGF0aWMgY29uc3Qgc3RydWN0IGFjcGlfZGV2aWNlX2lkIHBsaWNf YWNwaV9tYXRjaFtdID0geworCXsgIlJTQ1YwMDAxIiwgMCB9LAorCXt9Cit9OworTU9EVUxFX0RF VklDRV9UQUJMRShhY3BpLCBwbGljX2FjcGlfbWF0Y2gpOworCisjZW5kaWYKIHN0YXRpYyBpbnQg cGxpY19wYXJzZV9ucl9pcnFzX2FuZF9jb250ZXh0cyhzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpw ZGV2LAotCQkJCQkgICB1MzIgKm5yX2lycXMsIHUzMiAqbnJfY29udGV4dHMpCisJCQkJCSAgIHUz MiAqbnJfaXJxcywgdTMyICpucl9jb250ZXh0cywKKwkJCQkJICAgdTMyICpnc2lfYmFzZSwgdTMy ICppZCkKIHsKIAlzdHJ1Y3QgZGV2aWNlICpkZXYgPSAmcGRldi0+ZGV2OwogCWludCByYzsKIAot CS8qCi0JICogQ3VycmVudGx5LCBvbmx5IE9GIGZ3bm9kZSBpcyBzdXBwb3J0ZWQgc28gZXh0ZW5k IHRoaXMKLQkgKiBmdW5jdGlvbiBmb3IgQUNQSSBzdXBwb3J0LgotCSAqLwotCWlmICghaXNfb2Zf bm9kZShkZXYtPmZ3bm9kZSkpCi0JCXJldHVybiAtRUlOVkFMOworCWlmICghaXNfb2Zfbm9kZShk ZXYtPmZ3bm9kZSkpIHsKKwkJcmMgPSByaXNjdl9hY3BpX2dldF9nc2lfaW5mbyhkZXYtPmZ3bm9k ZSwgZ3NpX2Jhc2UsIGlkLCBucl9pcnFzLCBOVUxMKTsKKwkJaWYgKHJjKSB7CisJCQlkZXZfZXJy KGRldiwgImZhaWxlZCB0byBmaW5kIEdTSSBtYXBwaW5nXG4iKTsKKwkJCXJldHVybiByYzsKKwkJ fQorCisJCSpucl9jb250ZXh0cyA9IGFjcGlfcmludGNfZ2V0X3BsaWNfbnJfY29udGV4dHMoKmlk KTsKKwkJaWYgKFdBUk5fT04oISpucl9jb250ZXh0cykpIHsKKwkJCWRldl9lcnIoZGV2LCAibm8g UExJQyBjb250ZXh0IGF2YWlsYWJsZVxuIik7CisJCQlyZXR1cm4gLUVJTlZBTDsKKwkJfQorCisJ CXJldHVybiAwOworCX0KIAogCXJjID0gb2ZfcHJvcGVydHlfcmVhZF91MzIodG9fb2Zfbm9kZShk ZXYtPmZ3bm9kZSksICJyaXNjdixuZGV2IiwgbnJfaXJxcyk7CiAJaWYgKHJjKSB7CkBAIC00NDks MjMgKzQ3NSwyOSBAQCBzdGF0aWMgaW50IHBsaWNfcGFyc2VfbnJfaXJxc19hbmRfY29udGV4dHMo c3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiwKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQogCisJ KmdzaV9iYXNlID0gMDsKKwkqaWQgPSAwOworCiAJcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyBpbnQg cGxpY19wYXJzZV9jb250ZXh0X3BhcmVudChzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2LCB1 MzIgY29udGV4dCwKLQkJCQkgICAgIHUzMiAqcGFyZW50X2h3aXJxLCBpbnQgKnBhcmVudF9jcHUp CisJCQkJICAgICB1MzIgKnBhcmVudF9od2lycSwgaW50ICpwYXJlbnRfY3B1LCB1MzIgaWQpCiB7 CiAJc3RydWN0IGRldmljZSAqZGV2ID0gJnBkZXYtPmRldjsKIAlzdHJ1Y3Qgb2ZfcGhhbmRsZV9h cmdzIHBhcmVudDsKIAl1bnNpZ25lZCBsb25nIGhhcnRpZDsKIAlpbnQgcmM7CiAKLQkvKgotCSAq IEN1cnJlbnRseSwgb25seSBPRiBmd25vZGUgaXMgc3VwcG9ydGVkIHNvIGV4dGVuZCB0aGlzCi0J ICogZnVuY3Rpb24gZm9yIEFDUEkgc3VwcG9ydC4KLQkgKi8KLQlpZiAoIWlzX29mX25vZGUoZGV2 LT5md25vZGUpKQotCQlyZXR1cm4gLUVJTlZBTDsKKwlpZiAoIWlzX29mX25vZGUoZGV2LT5md25v ZGUpKSB7CisJCWhhcnRpZCA9IGFjcGlfcmludGNfZXh0X3BhcmVudF90b19oYXJ0aWQoaWQsIGNv bnRleHQpOworCQlpZiAoaGFydGlkID09IElOVkFMSURfSEFSVElEKQorCQkJcmV0dXJuIC1FSU5W QUw7CisKKwkJKnBhcmVudF9jcHUgPSByaXNjdl9oYXJ0aWRfdG9fY3B1aWQoaGFydGlkKTsKKwkJ KnBhcmVudF9od2lycSA9IFJWX0lSUV9FWFQ7CisJCXJldHVybiAwOworCX0KIAogCXJjID0gb2Zf aXJxX3BhcnNlX29uZSh0b19vZl9ub2RlKGRldi0+Zndub2RlKSwgY29udGV4dCwgJnBhcmVudCk7 CiAJaWYgKHJjKQpAQCAtNDg5LDYgKzUyMSw4IEBAIHN0YXRpYyBpbnQgcGxpY19wcm9iZShzdHJ1 Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogCXUzMiBucl9pcnFzLCBwYXJlbnRfaHdpcnE7CiAJ c3RydWN0IHBsaWNfcHJpdiAqcHJpdjsKIAlpcnFfaHdfbnVtYmVyX3QgaHdpcnE7CisJaW50IGlk LCBjb250ZXh0X2lkOworCXUzMiBnc2lfYmFzZTsKIAogCWlmIChpc19vZl9ub2RlKGRldi0+Zndu b2RlKSkgewogCQljb25zdCBzdHJ1Y3Qgb2ZfZGV2aWNlX2lkICppZDsKQEAgLTQ5OCw3ICs1MzIs NyBAQCBzdGF0aWMgaW50IHBsaWNfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikK IAkJCXBsaWNfcXVpcmtzID0gKHVuc2lnbmVkIGxvbmcpaWQtPmRhdGE7CiAJfQogCi0JZXJyb3Ig PSBwbGljX3BhcnNlX25yX2lycXNfYW5kX2NvbnRleHRzKHBkZXYsICZucl9pcnFzLCAmbnJfY29u dGV4dHMpOworCWVycm9yID0gcGxpY19wYXJzZV9ucl9pcnFzX2FuZF9jb250ZXh0cyhwZGV2LCAm bnJfaXJxcywgJm5yX2NvbnRleHRzLCAmZ3NpX2Jhc2UsICZpZCk7CiAJaWYgKGVycm9yKQogCQly ZXR1cm4gZXJyb3I7CiAKQEAgLTUwOSw2ICs1NDMsOCBAQCBzdGF0aWMgaW50IHBsaWNfcHJvYmUo c3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAlwcml2LT5kZXYgPSBkZXY7CiAJcHJpdi0+ cGxpY19xdWlya3MgPSBwbGljX3F1aXJrczsKIAlwcml2LT5ucl9pcnFzID0gbnJfaXJxczsKKwlw cml2LT5nc2lfYmFzZSA9IGdzaV9iYXNlOworCXByaXYtPmFjcGlfcGxpY19pZCA9IGlkOwogCiAJ cHJpdi0+cmVncyA9IGRldm1fcGxhdGZvcm1faW9yZW1hcF9yZXNvdXJjZShwZGV2LCAwKTsKIAlp ZiAoV0FSTl9PTighcHJpdi0+cmVncykpCkBAIC01MTksMTIgKzU1NSwyMyBAQCBzdGF0aWMgaW50 IHBsaWNfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAkJcmV0dXJuIC1FTk9N RU07CiAKIAlmb3IgKGkgPSAwOyBpIDwgbnJfY29udGV4dHM7IGkrKykgewotCQllcnJvciA9IHBs aWNfcGFyc2VfY29udGV4dF9wYXJlbnQocGRldiwgaSwgJnBhcmVudF9od2lycSwgJmNwdSk7CisJ CWVycm9yID0gcGxpY19wYXJzZV9jb250ZXh0X3BhcmVudChwZGV2LCBpLCAmcGFyZW50X2h3aXJx LCAmY3B1LAorCQkJCQkJICBwcml2LT5hY3BpX3BsaWNfaWQpOwogCQlpZiAoZXJyb3IpIHsKIAkJ CWRldl93YXJuKGRldiwgImh3aXJxIGZvciBjb250ZXh0JWQgbm90IGZvdW5kXG4iLCBpKTsKIAkJ CWNvbnRpbnVlOwogCQl9CiAKKwkJaWYgKGlzX29mX25vZGUoZGV2LT5md25vZGUpKSB7CisJCQlj b250ZXh0X2lkID0gaTsKKwkJfSBlbHNlIHsKKwkJCWNvbnRleHRfaWQgPSBhY3BpX3JpbnRjX2dl dF9wbGljX2NvbnRleHQocHJpdi0+YWNwaV9wbGljX2lkLCBpKTsKKwkJCWlmIChjb250ZXh0X2lk ID09IElOVkFMSURfQ09OVEVYVCkgeworCQkJCWRldl93YXJuKGRldiwgImludmFsaWQgY29udGV4 dCBpZCBmb3IgY29udGV4dCVkXG4iLCBpKTsKKwkJCQljb250aW51ZTsKKwkJCX0KKwkJfQorCiAJ CS8qCiAJCSAqIFNraXAgY29udGV4dHMgb3RoZXIgdGhhbiBleHRlcm5hbCBpbnRlcnJ1cHRzIGZv ciBvdXIKIAkJICogcHJpdmlsZWdlIGxldmVsLgpAQCAtNTYyLDEwICs2MDksMTAgQEAgc3RhdGlj IGludCBwbGljX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJCWNwdW1hc2tf c2V0X2NwdShjcHUsICZwcml2LT5sbWFzayk7CiAJCWhhbmRsZXItPnByZXNlbnQgPSB0cnVlOwog CQloYW5kbGVyLT5oYXJ0X2Jhc2UgPSBwcml2LT5yZWdzICsgQ09OVEVYVF9CQVNFICsKLQkJCWkg KiBDT05URVhUX1NJWkU7CisJCQljb250ZXh0X2lkICogQ09OVEVYVF9TSVpFOwogCQlyYXdfc3Bp bl9sb2NrX2luaXQoJmhhbmRsZXItPmVuYWJsZV9sb2NrKTsKIAkJaGFuZGxlci0+ZW5hYmxlX2Jh c2UgPSBwcml2LT5yZWdzICsgQ09OVEVYVF9FTkFCTEVfQkFTRSArCi0JCQlpICogQ09OVEVYVF9F TkFCTEVfU0laRTsKKwkJCWNvbnRleHRfaWQgKiBDT05URVhUX0VOQUJMRV9TSVpFOwogCQloYW5k bGVyLT5wcml2ID0gcHJpdjsKIAogCQloYW5kbGVyLT5lbmFibGVfc2F2ZSA9IGRldm1fa2NhbGxv YyhkZXYsIERJVl9ST1VORF9VUChucl9pcnFzLCAzMiksCkBAIC01ODEsOCArNjI4LDggQEAgc3Rh dGljIGludCBwbGljX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJCW5yX2hh bmRsZXJzKys7CiAJfQogCi0JcHJpdi0+aXJxZG9tYWluID0gaXJxX2RvbWFpbl9hZGRfbGluZWFy KHRvX29mX25vZGUoZGV2LT5md25vZGUpLCBucl9pcnFzICsgMSwKLQkJCQkJCSZwbGljX2lycWRv bWFpbl9vcHMsIHByaXYpOworCXByaXYtPmlycWRvbWFpbiA9IGlycV9kb21haW5fY3JlYXRlX2xp bmVhcihkZXYtPmZ3bm9kZSwgbnJfaXJxcyArIDEsCisJCQkJCQkgICAmcGxpY19pcnFkb21haW5f b3BzLCBwcml2KTsKIAlpZiAoV0FSTl9PTighcHJpdi0+aXJxZG9tYWluKSkKIAkJZ290byBmYWls X2NsZWFudXBfY29udGV4dHM7CiAKQEAgLTYxOSwxMyArNjY2LDE4IEBAIHN0YXRpYyBpbnQgcGxp Y19wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogCQl9CiAJfQogCisjaWZkZWYg Q09ORklHX0FDUEkKKwlpZiAoIWFjcGlfZGlzYWJsZWQpCisJCWFjcGlfZGV2X2NsZWFyX2RlcGVu ZGVuY2llcyhBQ1BJX0NPTVBBTklPTihkZXYpKTsKKyNlbmRpZgorCiAJZGV2X2luZm8oZGV2LCAi bWFwcGVkICVkIGludGVycnVwdHMgd2l0aCAlZCBoYW5kbGVycyBmb3IgJWQgY29udGV4dHMuXG4i LAogCQkgbnJfaXJxcywgbnJfaGFuZGxlcnMsIG5yX2NvbnRleHRzKTsKIAlyZXR1cm4gMDsKIAog ZmFpbF9jbGVhbnVwX2NvbnRleHRzOgogCWZvciAoaSA9IDA7IGkgPCBucl9jb250ZXh0czsgaSsr KSB7Ci0JCWlmIChwbGljX3BhcnNlX2NvbnRleHRfcGFyZW50KHBkZXYsIGksICZwYXJlbnRfaHdp cnEsICZjcHUpKQorCQlpZiAocGxpY19wYXJzZV9jb250ZXh0X3BhcmVudChwZGV2LCBpLCAmcGFy ZW50X2h3aXJxLCAmY3B1LCBwcml2LT5hY3BpX3BsaWNfaWQpKQogCQkJY29udGludWU7CiAJCWlm IChwYXJlbnRfaHdpcnEgIT0gUlZfSVJRX0VYVCB8fCBjcHUgPCAwKQogCQkJY29udGludWU7CkBA IC02NDQsNiArNjk2LDcgQEAgc3RhdGljIHN0cnVjdCBwbGF0Zm9ybV9kcml2ZXIgcGxpY19kcml2 ZXIgPSB7CiAJLmRyaXZlciA9IHsKIAkJLm5hbWUJCT0gInJpc2N2LXBsaWMiLAogCQkub2ZfbWF0 Y2hfdGFibGUJPSBwbGljX21hdGNoLAorCQkuYWNwaV9tYXRjaF90YWJsZSA9IEFDUElfUFRSKHBs aWNfYWNwaV9tYXRjaCksCiAJfSwKIAkucHJvYmUgPSBwbGljX3Byb2JlLAogfTsKLS0gCjIuNDMu MAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4 LXJpc2N2IG1haWxpbmcgbGlzdApsaW51eC1yaXNjdkBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6 Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtcmlzY3YK