From patchwork Mon Aug 14 07:08:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 9898281 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3793660230 for ; Mon, 14 Aug 2017 07:12:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A5E726E1A for ; Mon, 14 Aug 2017 07:12:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F46B26E4A; Mon, 14 Aug 2017 07:12:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B8B88285E5 for ; Mon, 14 Aug 2017 07:12:15 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dh9Vq-0006OE-0g; Mon, 14 Aug 2017 07:10:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dh9Vo-0006I5-J7 for xen-devel@lists.xenproject.org; Mon, 14 Aug 2017 07:10:08 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 87/4F-02176-FCC41995; Mon, 14 Aug 2017 07:10:07 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrALMWRWlGSWpSXmKPExsVyuP0Ov+55n4m RBssfCFp83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBnz57kULBepuHrhHFsD4yr+LkZODgkBI4m3 E/8xdTFycQgJLGSUaFt2kAkkwSagKrHh+ilWEFtEQEni3qrJYHFmgWiJt79/gNnCAmUSLzc2M IPYLED1h/u+sIHYvAKmEvd+X2OHWCAv0XFgMguIzQkUv7RvKZgtJGAi0be1i2UCI/cCRoZVjO rFqUVlqUW6RnpJRZnpGSW5iZk5uoYGxnq5qcXFiempOYlJxXrJ+bmbGIG+rWdgYNzBeKrZ+RC jJAeTkihvgk9vpBBfUn5KZUZicUZ8UWlOavEhRhkODiUJXinviZFCgkWp6akVaZk5wCCDSUtw 8CiJ8JZ7AaV5iwsSc4sz0yFSpxh1OV5N+P+NSYglLz8vVUqc9xlIkQBIUUZpHtwIWMBfYpSVE uZlZGBgEOIpSC3KzSxBlX/FKM7BqCTMawdyCU9mXgncpldARzABHdEHcj9vcUkiQkqqgdH84a mUtXNsn+tN4OIP+n7lRRXLHt/Z/2ZveNrocmeSR22le4+BipOFxtpngtXnq/Pcj8yZUqQb3ZL kv/tiTn2XU9NGucvPv6lFe7Ib2X3mr2i8l3mL/0r79Sh2natsP+XUtnMfPT6vNjNCK+jJ4iTL uVGvZ5f16vFsyLGQ2v306ZNViyU3ViixFGckGmoxFxUnAgBVz2emcwIAAA== X-Env-Sender: jgross@suse.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1502694607!102259858!1 X-Originating-IP: [195.135.220.15] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13571 invoked from network); 14 Aug 2017 07:10:07 -0000 Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by server-16.tower-31.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 14 Aug 2017 07:10:07 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id F2C69AD51; Mon, 14 Aug 2017 07:09:06 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Mon, 14 Aug 2017 09:08:29 +0200 Message-Id: <20170814070849.20986-33-jgross@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20170814070849.20986-1-jgross@suse.com> References: <20170814070849.20986-1-jgross@suse.com> Cc: Juergen Gross , Suravee Suthikulpanit Subject: [Xen-devel] [PATCH v2 32/52] xen/drivers/passthrough/amd/iommu_acpi.c: let custom parameter parsing routines return errno X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Modify the custom parameter parsing routines in: xen/drivers/passthrough/amd/iommu_acpi.c to indicate whether the parameter value was parsed successfully. Cc: Suravee Suthikulpanit Signed-off-by: Juergen Gross Acked-by: Wei Liu --- xen/drivers/passthrough/amd/iommu_acpi.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index f4c7206c2a..cd27bcef66 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -632,21 +632,23 @@ static u16 __init parse_ivhd_device_extended_range( return dev_length; } -static void __init parse_ivrs_ioapic(char *str) +static int __init parse_ivrs_ioapic(char *str) { const char *s = str; unsigned long id; unsigned int seg, bus, dev, func; unsigned int idx; - ASSERT(*s == '['); + if ( *s != '[' ) + return -EINVAL; + id = simple_strtoul(s + 1, &s, 0); if ( *s != ']' || *++s != '=' ) - return; + return -EINVAL; s = parse_pci(s + 1, &seg, &bus, &dev, &func); if ( !s || *s ) - return; + return -EINVAL; idx = ioapic_id_to_index(id); if ( idx == MAX_IO_APICS ) @@ -655,7 +657,7 @@ static void __init parse_ivrs_ioapic(char *str) if ( idx == MAX_IO_APICS ) { printk(XENLOG_ERR "Error: %s: Too many IO APICs.\n", __func__); - return; + return -EINVAL; } } @@ -663,28 +665,34 @@ static void __init parse_ivrs_ioapic(char *str) ioapic_sbdf[idx].seg = seg; ioapic_sbdf[idx].id = id; ioapic_sbdf[idx].cmdline = true; + + return 0; } custom_param("ivrs_ioapic[", parse_ivrs_ioapic); -static void __init parse_ivrs_hpet(char *str) +static int __init parse_ivrs_hpet(char *str) { const char *s = str; unsigned long id; unsigned int seg, bus, dev, func; - ASSERT(*s == '['); + if ( *s != '[' ) + return -EINVAL; + id = simple_strtoul(s + 1, &s, 0); if ( id != (typeof(hpet_sbdf.id))id || *s != ']' || *++s != '=' ) - return; + return -EINVAL; s = parse_pci(s + 1, &seg, &bus, &dev, &func); if ( !s || *s ) - return; + return -EINVAL; hpet_sbdf.id = id; hpet_sbdf.bdf = PCI_BDF(bus, dev, func); hpet_sbdf.seg = seg; hpet_sbdf.init = HPET_CMDL; + + return 0; } custom_param("ivrs_hpet[", parse_ivrs_hpet);