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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8D44C677F1 for ; Mon, 13 Feb 2023 10:43:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230252AbjBMKn2 (ORCPT ); Mon, 13 Feb 2023 05:43:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229658AbjBMKnU (ORCPT ); Mon, 13 Feb 2023 05:43:20 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 349961633C; Mon, 13 Feb 2023 02:43:18 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C414660F93; Mon, 13 Feb 2023 10:43:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6588C43329; Mon, 13 Feb 2023 10:43:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676284996; bh=ucy+R2vGCNnMk+YHMmgUl332bM/zsahp7MGXe5tUo8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LYVwP56oj4WQuL7Jj4nC5sDEk7NsGbZkLxLODTDUfBw2bovSb9+5zQi9Euu1N6wUg +AJ9ZaW5e2YKtvae1YqD76a2MWn6RzL9o7j8oucf00Wtu01adx+/zML57SPDdahJkw 74kH0SMxpKDXSx+pLk0JR4yjpOtb4e/uPo7RRgnaHdW5898+WIcM3oXyAxPrCYqL7e eM240Kvn3U5Te3+2j3O6DSe4n9lU7epwaAcylWM4ZBm5dPd42CpoUFiwBqoKm7et4l GuXAZbNFNeyjRYim5j5Hl7pf65v9hs2IY0Uk4Dd47bYDjXGymVDun5XOuU7ERBted5 ol7PX1zGCDu1Q== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pRWJb-0004Wl-Sy; Mon, 13 Feb 2023 11:44:07 +0100 From: Johan Hovold To: Marc Zyngier , Thomas Gleixner Cc: x86@kernel.org, platform-driver-x86@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Hsin-Yi Wang , Mark-PK Tsai Subject: [PATCH v6 11/20] irqdomain: Clean up irq_domain_push/pop_irq() Date: Mon, 13 Feb 2023 11:42:53 +0100 Message-Id: <20230213104302.17307-12-johan+linaro@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230213104302.17307-1-johan+linaro@kernel.org> References: <20230213104302.17307-1-johan+linaro@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The irq_domain_push_irq() interface is used to add a new (outmost) level to a hierarchical domain after IRQs have been allocated. Possibly due to differing mental images of hierarchical domains, the names used for the irq_data variables make these functions much harder to understand than what they need to be. Rename the struct irq_data pointer to the data embedded in the descriptor as simply 'irq_data' and refer to the data allocated by this interface as 'parent_irq_data' so that the names reflect how hierarchical domains are implemented. Reviewed-by: Philippe Mathieu-Daudé Tested-by: Hsin-Yi Wang Tested-by: Mark-PK Tsai Signed-off-by: Johan Hovold --- kernel/irq/irqdomain.c | 65 +++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 7785b3352e60..2213d972f083 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -1598,8 +1598,8 @@ static void irq_domain_fix_revmap(struct irq_data *d) */ int irq_domain_push_irq(struct irq_domain *domain, int virq, void *arg) { - struct irq_data *child_irq_data; - struct irq_data *root_irq_data = irq_get_irq_data(virq); + struct irq_data *irq_data = irq_get_irq_data(virq); + struct irq_data *parent_irq_data; struct irq_desc *desc; int rv = 0; @@ -1624,45 +1624,44 @@ int irq_domain_push_irq(struct irq_domain *domain, int virq, void *arg) if (WARN_ON(!irq_domain_is_hierarchy(domain))) return -EINVAL; - if (!root_irq_data) + if (!irq_data) return -EINVAL; - if (domain->parent != root_irq_data->domain) + if (domain->parent != irq_data->domain) return -EINVAL; - child_irq_data = kzalloc_node(sizeof(*child_irq_data), GFP_KERNEL, - irq_data_get_node(root_irq_data)); - if (!child_irq_data) + parent_irq_data = kzalloc_node(sizeof(*parent_irq_data), GFP_KERNEL, + irq_data_get_node(irq_data)); + if (!parent_irq_data) return -ENOMEM; mutex_lock(&irq_domain_mutex); /* Copy the original irq_data. */ - *child_irq_data = *root_irq_data; + *parent_irq_data = *irq_data; /* - * Overwrite the root_irq_data, which is embedded in struct - * irq_desc, with values for this domain. + * Overwrite the irq_data, which is embedded in struct irq_desc, with + * values for this domain. */ - root_irq_data->parent_data = child_irq_data; - root_irq_data->domain = domain; - root_irq_data->mask = 0; - root_irq_data->hwirq = 0; - root_irq_data->chip = NULL; - root_irq_data->chip_data = NULL; + irq_data->parent_data = parent_irq_data; + irq_data->domain = domain; + irq_data->mask = 0; + irq_data->hwirq = 0; + irq_data->chip = NULL; + irq_data->chip_data = NULL; /* May (probably does) set hwirq, chip, etc. */ rv = irq_domain_alloc_irqs_hierarchy(domain, virq, 1, arg); if (rv) { /* Restore the original irq_data. */ - *root_irq_data = *child_irq_data; - kfree(child_irq_data); + *irq_data = *parent_irq_data; + kfree(parent_irq_data); goto error; } - irq_domain_fix_revmap(child_irq_data); - irq_domain_set_mapping(domain, root_irq_data->hwirq, root_irq_data); - + irq_domain_fix_revmap(parent_irq_data); + irq_domain_set_mapping(domain, irq_data->hwirq, irq_data); error: mutex_unlock(&irq_domain_mutex); @@ -1680,8 +1679,8 @@ EXPORT_SYMBOL_GPL(irq_domain_push_irq); */ int irq_domain_pop_irq(struct irq_domain *domain, int virq) { - struct irq_data *root_irq_data = irq_get_irq_data(virq); - struct irq_data *child_irq_data; + struct irq_data *irq_data = irq_get_irq_data(virq); + struct irq_data *parent_irq_data; struct irq_data *tmp_irq_data; struct irq_desc *desc; @@ -1703,37 +1702,37 @@ int irq_domain_pop_irq(struct irq_domain *domain, int virq) if (domain == NULL) return -EINVAL; - if (!root_irq_data) + if (!irq_data) return -EINVAL; tmp_irq_data = irq_domain_get_irq_data(domain, virq); /* We can only "pop" if this domain is at the top of the list */ - if (WARN_ON(root_irq_data != tmp_irq_data)) + if (WARN_ON(irq_data != tmp_irq_data)) return -EINVAL; - if (WARN_ON(root_irq_data->domain != domain)) + if (WARN_ON(irq_data->domain != domain)) return -EINVAL; - child_irq_data = root_irq_data->parent_data; - if (WARN_ON(!child_irq_data)) + parent_irq_data = irq_data->parent_data; + if (WARN_ON(!parent_irq_data)) return -EINVAL; mutex_lock(&irq_domain_mutex); - root_irq_data->parent_data = NULL; + irq_data->parent_data = NULL; - irq_domain_clear_mapping(domain, root_irq_data->hwirq); + irq_domain_clear_mapping(domain, irq_data->hwirq); irq_domain_free_irqs_hierarchy(domain, virq, 1); /* Restore the original irq_data. */ - *root_irq_data = *child_irq_data; + *irq_data = *parent_irq_data; - irq_domain_fix_revmap(root_irq_data); + irq_domain_fix_revmap(irq_data); mutex_unlock(&irq_domain_mutex); - kfree(child_irq_data); + kfree(parent_irq_data); return 0; } -- 2.39.1 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 410A9C636D4 for ; Mon, 13 Feb 2023 10:44:53 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=G03qq5JL3vzkQXOqMOKhjH20f1dUkRbO523ifDr56J0=; b=rukWBhnVrTd/xX G/bHcoV6XMzUBVFPyDGVw+ERHBxNyMrP2H2QbcJ0ByCOghEMC1js5Byhd66c8z6MpBUVIgfu6E84o t75wryYrkVbYlCHehCaFlUQyi29u1HSjw+yLg2CpPWBVBbcxLoq13vQRvdMOaVvrdXFvju8P3tIXA /gb07YHW6uYFZAvhjzke7/6hK9aNaQWRFnQVACoqljRMlDcUeN2eOYxOFVQA2MD/+FJtFQ42PKwBL aHCyD5iU3fp8Qvp3+fxeu0i13ONIdJUsXoQZDXaEEmSiqmP3qu4INvqU5EtqyTFGdyuDeTsbwlnQ/ bP6s5YSgVSKbAygz0yWQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pRWJD-00E9b0-KX; Mon, 13 Feb 2023 10:43:43 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pRWIo-00E9Kf-JX for linux-arm-kernel@lists.infradead.org; Mon, 13 Feb 2023 10:43:21 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3168360FA3; Mon, 13 Feb 2023 10:43:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6588C43329; Mon, 13 Feb 2023 10:43:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676284996; bh=ucy+R2vGCNnMk+YHMmgUl332bM/zsahp7MGXe5tUo8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LYVwP56oj4WQuL7Jj4nC5sDEk7NsGbZkLxLODTDUfBw2bovSb9+5zQi9Euu1N6wUg +AJ9ZaW5e2YKtvae1YqD76a2MWn6RzL9o7j8oucf00Wtu01adx+/zML57SPDdahJkw 74kH0SMxpKDXSx+pLk0JR4yjpOtb4e/uPo7RRgnaHdW5898+WIcM3oXyAxPrCYqL7e eM240Kvn3U5Te3+2j3O6DSe4n9lU7epwaAcylWM4ZBm5dPd42CpoUFiwBqoKm7et4l GuXAZbNFNeyjRYim5j5Hl7pf65v9hs2IY0Uk4Dd47bYDjXGymVDun5XOuU7ERBted5 ol7PX1zGCDu1Q== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pRWJb-0004Wl-Sy; Mon, 13 Feb 2023 11:44:07 +0100 From: Johan Hovold To: Marc Zyngier , Thomas Gleixner Cc: x86@kernel.org, platform-driver-x86@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Hsin-Yi Wang , Mark-PK Tsai Subject: [PATCH v6 11/20] irqdomain: Clean up irq_domain_push/pop_irq() Date: Mon, 13 Feb 2023 11:42:53 +0100 Message-Id: <20230213104302.17307-12-johan+linaro@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230213104302.17307-1-johan+linaro@kernel.org> References: <20230213104302.17307-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230213_024318_757478_427EEE90 X-CRM114-Status: GOOD ( 20.03 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org VGhlIGlycV9kb21haW5fcHVzaF9pcnEoKSBpbnRlcmZhY2UgaXMgdXNlZCB0byBhZGQgYSBuZXcg KG91dG1vc3QpIGxldmVsCnRvIGEgaGllcmFyY2hpY2FsIGRvbWFpbiBhZnRlciBJUlFzIGhhdmUg YmVlbiBhbGxvY2F0ZWQuCgpQb3NzaWJseSBkdWUgdG8gZGlmZmVyaW5nIG1lbnRhbCBpbWFnZXMg b2YgaGllcmFyY2hpY2FsIGRvbWFpbnMsIHRoZQpuYW1lcyB1c2VkIGZvciB0aGUgaXJxX2RhdGEg dmFyaWFibGVzIG1ha2UgdGhlc2UgZnVuY3Rpb25zIG11Y2ggaGFyZGVyCnRvIHVuZGVyc3RhbmQg dGhhbiB3aGF0IHRoZXkgbmVlZCB0byBiZS4KClJlbmFtZSB0aGUgc3RydWN0IGlycV9kYXRhIHBv aW50ZXIgdG8gdGhlIGRhdGEgZW1iZWRkZWQgaW4gdGhlCmRlc2NyaXB0b3IgYXMgc2ltcGx5ICdp cnFfZGF0YScgYW5kIHJlZmVyIHRvIHRoZSBkYXRhIGFsbG9jYXRlZCBieSB0aGlzCmludGVyZmFj ZSBhcyAncGFyZW50X2lycV9kYXRhJyBzbyB0aGF0IHRoZSBuYW1lcyByZWZsZWN0IGhvdwpoaWVy YXJjaGljYWwgZG9tYWlucyBhcmUgaW1wbGVtZW50ZWQuCgpSZXZpZXdlZC1ieTogUGhpbGlwcGUg TWF0aGlldS1EYXVkw6kgPHBoaWxtZEBsaW5hcm8ub3JnPgpUZXN0ZWQtYnk6IEhzaW4tWWkgV2Fu ZyA8aHNpbnlpQGNocm9taXVtLm9yZz4KVGVzdGVkLWJ5OiBNYXJrLVBLIFRzYWkgPG1hcmstcGsu dHNhaUBtZWRpYXRlay5jb20+ClNpZ25lZC1vZmYtYnk6IEpvaGFuIEhvdm9sZCA8am9oYW4rbGlu YXJvQGtlcm5lbC5vcmc+Ci0tLQoga2VybmVsL2lycS9pcnFkb21haW4uYyB8IDY1ICsrKysrKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDMyIGlu c2VydGlvbnMoKyksIDMzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2tlcm5lbC9pcnEvaXJx ZG9tYWluLmMgYi9rZXJuZWwvaXJxL2lycWRvbWFpbi5jCmluZGV4IDc3ODViMzM1MmU2MC4uMjIx M2Q5NzJmMDgzIDEwMDY0NAotLS0gYS9rZXJuZWwvaXJxL2lycWRvbWFpbi5jCisrKyBiL2tlcm5l bC9pcnEvaXJxZG9tYWluLmMKQEAgLTE1OTgsOCArMTU5OCw4IEBAIHN0YXRpYyB2b2lkIGlycV9k b21haW5fZml4X3Jldm1hcChzdHJ1Y3QgaXJxX2RhdGEgKmQpCiAgKi8KIGludCBpcnFfZG9tYWlu X3B1c2hfaXJxKHN0cnVjdCBpcnFfZG9tYWluICpkb21haW4sIGludCB2aXJxLCB2b2lkICphcmcp CiB7Ci0Jc3RydWN0IGlycV9kYXRhICpjaGlsZF9pcnFfZGF0YTsKLQlzdHJ1Y3QgaXJxX2RhdGEg KnJvb3RfaXJxX2RhdGEgPSBpcnFfZ2V0X2lycV9kYXRhKHZpcnEpOworCXN0cnVjdCBpcnFfZGF0 YSAqaXJxX2RhdGEgPSBpcnFfZ2V0X2lycV9kYXRhKHZpcnEpOworCXN0cnVjdCBpcnFfZGF0YSAq cGFyZW50X2lycV9kYXRhOwogCXN0cnVjdCBpcnFfZGVzYyAqZGVzYzsKIAlpbnQgcnYgPSAwOwog CkBAIC0xNjI0LDQ1ICsxNjI0LDQ0IEBAIGludCBpcnFfZG9tYWluX3B1c2hfaXJxKHN0cnVjdCBp cnFfZG9tYWluICpkb21haW4sIGludCB2aXJxLCB2b2lkICphcmcpCiAJaWYgKFdBUk5fT04oIWly cV9kb21haW5faXNfaGllcmFyY2h5KGRvbWFpbikpKQogCQlyZXR1cm4gLUVJTlZBTDsKIAotCWlm ICghcm9vdF9pcnFfZGF0YSkKKwlpZiAoIWlycV9kYXRhKQogCQlyZXR1cm4gLUVJTlZBTDsKIAot CWlmIChkb21haW4tPnBhcmVudCAhPSByb290X2lycV9kYXRhLT5kb21haW4pCisJaWYgKGRvbWFp bi0+cGFyZW50ICE9IGlycV9kYXRhLT5kb21haW4pCiAJCXJldHVybiAtRUlOVkFMOwogCi0JY2hp bGRfaXJxX2RhdGEgPSBremFsbG9jX25vZGUoc2l6ZW9mKCpjaGlsZF9pcnFfZGF0YSksIEdGUF9L RVJORUwsCi0JCQkJICAgICAgaXJxX2RhdGFfZ2V0X25vZGUocm9vdF9pcnFfZGF0YSkpOwotCWlm ICghY2hpbGRfaXJxX2RhdGEpCisJcGFyZW50X2lycV9kYXRhID0ga3phbGxvY19ub2RlKHNpemVv ZigqcGFyZW50X2lycV9kYXRhKSwgR0ZQX0tFUk5FTCwKKwkJCQkgICAgICAgaXJxX2RhdGFfZ2V0 X25vZGUoaXJxX2RhdGEpKTsKKwlpZiAoIXBhcmVudF9pcnFfZGF0YSkKIAkJcmV0dXJuIC1FTk9N RU07CiAKIAltdXRleF9sb2NrKCZpcnFfZG9tYWluX211dGV4KTsKIAogCS8qIENvcHkgdGhlIG9y aWdpbmFsIGlycV9kYXRhLiAqLwotCSpjaGlsZF9pcnFfZGF0YSA9ICpyb290X2lycV9kYXRhOwor CSpwYXJlbnRfaXJxX2RhdGEgPSAqaXJxX2RhdGE7CiAKIAkvKgotCSAqIE92ZXJ3cml0ZSB0aGUg cm9vdF9pcnFfZGF0YSwgd2hpY2ggaXMgZW1iZWRkZWQgaW4gc3RydWN0Ci0JICogaXJxX2Rlc2Ms IHdpdGggdmFsdWVzIGZvciB0aGlzIGRvbWFpbi4KKwkgKiBPdmVyd3JpdGUgdGhlIGlycV9kYXRh LCB3aGljaCBpcyBlbWJlZGRlZCBpbiBzdHJ1Y3QgaXJxX2Rlc2MsIHdpdGgKKwkgKiB2YWx1ZXMg Zm9yIHRoaXMgZG9tYWluLgogCSAqLwotCXJvb3RfaXJxX2RhdGEtPnBhcmVudF9kYXRhID0gY2hp bGRfaXJxX2RhdGE7Ci0Jcm9vdF9pcnFfZGF0YS0+ZG9tYWluID0gZG9tYWluOwotCXJvb3RfaXJx X2RhdGEtPm1hc2sgPSAwOwotCXJvb3RfaXJxX2RhdGEtPmh3aXJxID0gMDsKLQlyb290X2lycV9k YXRhLT5jaGlwID0gTlVMTDsKLQlyb290X2lycV9kYXRhLT5jaGlwX2RhdGEgPSBOVUxMOworCWly cV9kYXRhLT5wYXJlbnRfZGF0YSA9IHBhcmVudF9pcnFfZGF0YTsKKwlpcnFfZGF0YS0+ZG9tYWlu ID0gZG9tYWluOworCWlycV9kYXRhLT5tYXNrID0gMDsKKwlpcnFfZGF0YS0+aHdpcnEgPSAwOwor CWlycV9kYXRhLT5jaGlwID0gTlVMTDsKKwlpcnFfZGF0YS0+Y2hpcF9kYXRhID0gTlVMTDsKIAog CS8qIE1heSAocHJvYmFibHkgZG9lcykgc2V0IGh3aXJxLCBjaGlwLCBldGMuICovCiAJcnYgPSBp cnFfZG9tYWluX2FsbG9jX2lycXNfaGllcmFyY2h5KGRvbWFpbiwgdmlycSwgMSwgYXJnKTsKIAlp ZiAocnYpIHsKIAkJLyogUmVzdG9yZSB0aGUgb3JpZ2luYWwgaXJxX2RhdGEuICovCi0JCSpyb290 X2lycV9kYXRhID0gKmNoaWxkX2lycV9kYXRhOwotCQlrZnJlZShjaGlsZF9pcnFfZGF0YSk7CisJ CSppcnFfZGF0YSA9ICpwYXJlbnRfaXJxX2RhdGE7CisJCWtmcmVlKHBhcmVudF9pcnFfZGF0YSk7 CiAJCWdvdG8gZXJyb3I7CiAJfQogCi0JaXJxX2RvbWFpbl9maXhfcmV2bWFwKGNoaWxkX2lycV9k YXRhKTsKLQlpcnFfZG9tYWluX3NldF9tYXBwaW5nKGRvbWFpbiwgcm9vdF9pcnFfZGF0YS0+aHdp cnEsIHJvb3RfaXJxX2RhdGEpOwotCisJaXJxX2RvbWFpbl9maXhfcmV2bWFwKHBhcmVudF9pcnFf ZGF0YSk7CisJaXJxX2RvbWFpbl9zZXRfbWFwcGluZyhkb21haW4sIGlycV9kYXRhLT5od2lycSwg aXJxX2RhdGEpOwogZXJyb3I6CiAJbXV0ZXhfdW5sb2NrKCZpcnFfZG9tYWluX211dGV4KTsKIApA QCAtMTY4MCw4ICsxNjc5LDggQEAgRVhQT1JUX1NZTUJPTF9HUEwoaXJxX2RvbWFpbl9wdXNoX2ly cSk7CiAgKi8KIGludCBpcnFfZG9tYWluX3BvcF9pcnEoc3RydWN0IGlycV9kb21haW4gKmRvbWFp biwgaW50IHZpcnEpCiB7Ci0Jc3RydWN0IGlycV9kYXRhICpyb290X2lycV9kYXRhID0gaXJxX2dl dF9pcnFfZGF0YSh2aXJxKTsKLQlzdHJ1Y3QgaXJxX2RhdGEgKmNoaWxkX2lycV9kYXRhOworCXN0 cnVjdCBpcnFfZGF0YSAqaXJxX2RhdGEgPSBpcnFfZ2V0X2lycV9kYXRhKHZpcnEpOworCXN0cnVj dCBpcnFfZGF0YSAqcGFyZW50X2lycV9kYXRhOwogCXN0cnVjdCBpcnFfZGF0YSAqdG1wX2lycV9k YXRhOwogCXN0cnVjdCBpcnFfZGVzYyAqZGVzYzsKIApAQCAtMTcwMywzNyArMTcwMiwzNyBAQCBp bnQgaXJxX2RvbWFpbl9wb3BfaXJxKHN0cnVjdCBpcnFfZG9tYWluICpkb21haW4sIGludCB2aXJx KQogCWlmIChkb21haW4gPT0gTlVMTCkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKLQlpZiAoIXJvb3Rf aXJxX2RhdGEpCisJaWYgKCFpcnFfZGF0YSkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKIAl0bXBfaXJx X2RhdGEgPSBpcnFfZG9tYWluX2dldF9pcnFfZGF0YShkb21haW4sIHZpcnEpOwogCiAJLyogV2Ug Y2FuIG9ubHkgInBvcCIgaWYgdGhpcyBkb21haW4gaXMgYXQgdGhlIHRvcCBvZiB0aGUgbGlzdCAq LwotCWlmIChXQVJOX09OKHJvb3RfaXJxX2RhdGEgIT0gdG1wX2lycV9kYXRhKSkKKwlpZiAoV0FS Tl9PTihpcnFfZGF0YSAhPSB0bXBfaXJxX2RhdGEpKQogCQlyZXR1cm4gLUVJTlZBTDsKIAotCWlm IChXQVJOX09OKHJvb3RfaXJxX2RhdGEtPmRvbWFpbiAhPSBkb21haW4pKQorCWlmIChXQVJOX09O KGlycV9kYXRhLT5kb21haW4gIT0gZG9tYWluKSkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKLQljaGls ZF9pcnFfZGF0YSA9IHJvb3RfaXJxX2RhdGEtPnBhcmVudF9kYXRhOwotCWlmIChXQVJOX09OKCFj aGlsZF9pcnFfZGF0YSkpCisJcGFyZW50X2lycV9kYXRhID0gaXJxX2RhdGEtPnBhcmVudF9kYXRh OworCWlmIChXQVJOX09OKCFwYXJlbnRfaXJxX2RhdGEpKQogCQlyZXR1cm4gLUVJTlZBTDsKIAog CW11dGV4X2xvY2soJmlycV9kb21haW5fbXV0ZXgpOwogCi0Jcm9vdF9pcnFfZGF0YS0+cGFyZW50 X2RhdGEgPSBOVUxMOworCWlycV9kYXRhLT5wYXJlbnRfZGF0YSA9IE5VTEw7CiAKLQlpcnFfZG9t YWluX2NsZWFyX21hcHBpbmcoZG9tYWluLCByb290X2lycV9kYXRhLT5od2lycSk7CisJaXJxX2Rv bWFpbl9jbGVhcl9tYXBwaW5nKGRvbWFpbiwgaXJxX2RhdGEtPmh3aXJxKTsKIAlpcnFfZG9tYWlu X2ZyZWVfaXJxc19oaWVyYXJjaHkoZG9tYWluLCB2aXJxLCAxKTsKIAogCS8qIFJlc3RvcmUgdGhl IG9yaWdpbmFsIGlycV9kYXRhLiAqLwotCSpyb290X2lycV9kYXRhID0gKmNoaWxkX2lycV9kYXRh OworCSppcnFfZGF0YSA9ICpwYXJlbnRfaXJxX2RhdGE7CiAKLQlpcnFfZG9tYWluX2ZpeF9yZXZt YXAocm9vdF9pcnFfZGF0YSk7CisJaXJxX2RvbWFpbl9maXhfcmV2bWFwKGlycV9kYXRhKTsKIAog CW11dGV4X3VubG9jaygmaXJxX2RvbWFpbl9tdXRleCk7CiAKLQlrZnJlZShjaGlsZF9pcnFfZGF0 YSk7CisJa2ZyZWUocGFyZW50X2lycV9kYXRhKTsKIAogCXJldHVybiAwOwogfQotLSAKMi4zOS4x CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgt YXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQu b3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJt LWtlcm5lbAo=