From patchwork Tue Jul 24 22:15:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Levand X-Patchwork-Id: 948894 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Zt765PWSz9s2g for ; Wed, 25 Jul 2018 08:18:58 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="AHn+arqO"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 41Zt763f6YzDrHr for ; Wed, 25 Jul 2018 08:18:58 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="AHn+arqO"; dkim-atps=neutral X-Original-To: Petitboot@lists.ozlabs.org Delivered-To: Petitboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (mailfrom) smtp.mailfrom=infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=geoff@infradead.org; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="AHn+arqO"; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 41Zt3R4WB1zDrpd for ; Wed, 25 Jul 2018 08:15:47 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Date:Cc:To:Subject:From:References: In-Reply-To:Message-Id:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=fIqN0Fwan8A2aac1R38qyR0sNRBoXuKKTSO3tfR6VFM=; b=AHn+arqOWq3qx8ZP8o3dqP2vm +mbxiUq5D7PBCdL07Db9tXe2tExvdx1bJhFKSpukeiGBhZLY24dGUSbQYiO4E1VtwZD6cJkJUxxTB ZEIDlGDbcaCVdEjhUpGTiuepNPo3VjZjIQNFqUqhStDA2LhmFgFsNf4+dUr4Xwnvw3EmLEuU4RYYS 9szUTlKm+f8U8UGeaXk7kZoPLx7qeKyTlassmI6RtxVNhZX2wPsNtK5lk0UNwl1nfMgXYkCajP8sb qkixt4V9mvz6AmqtiNp/yu/jfGcIpzaOxhGC1wbyFC3MKKhkr5+8/rE4QPPaYoCAb6/+kIAc2+xK1 n3EZbKPTg==; Received: from geoff by merlin.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1fi5ap-0004la-QV; Tue, 24 Jul 2018 22:15:43 +0000 Message-Id: <0036113d8438eedf79f4282e85982d95e6fa0c23.1532469861.git.geoff@infradead.org> In-Reply-To: References: From: Geoff Levand Patch-Date: Tue, 24 Jul 2018 15:03:16 -0700 Subject: [PATCH v1 22/30] discover/powerpc: Switch to new param_list To: Samuel Mendoza-Jonas Date: Tue, 24 Jul 2018 22:15:43 +0000 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ge Song , Petitboot@lists.ozlabs.org MIME-Version: 1.0 Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" Signed-off-by: Geoff Levand --- discover/platform-powerpc.c | 201 ++++++++++++-------------------------------- 1 file changed, 52 insertions(+), 149 deletions(-) diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c index 87ff72e..b5e4a8e 100644 --- a/discover/platform-powerpc.c +++ b/discover/platform-powerpc.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -27,15 +28,8 @@ static const char *partition = "common"; static const char *sysparams_dir = "/sys/firmware/opal/sysparams/"; static const char *devtree_dir = "/proc/device-tree/"; -struct param { - char *name; - char *value; - bool modified; - struct list_item list; -}; - struct platform_powerpc { - struct list params; + struct param_list params; struct ipmi *ipmi; bool ipmi_bootdev_persistent; int (*get_ipmi_bootdev)( @@ -49,39 +43,9 @@ struct platform_powerpc { void (*get_platform_versions)(struct system_info *info); }; -static const char *known_params[] = { - "auto-boot?", - "petitboot,network", - "petitboot,timeout", - "petitboot,bootdevs", - "petitboot,language", - "petitboot,debug?", - "petitboot,write?", - "petitboot,snapshots?", - "petitboot,console", - "petitboot,http_proxy", - "petitboot,https_proxy", - NULL, -}; - #define to_platform_powerpc(p) \ (struct platform_powerpc *)(p->platform_data) -static bool param_is_known(const char *param, unsigned int len) -{ - const char *known_param; - unsigned int i; - - for (i = 0; known_params[i]; i++) { - known_param = known_params[i]; - if (len == strlen(known_param) && - !strncmp(param, known_param, len)) - return true; - } - - return false; -} - static int parse_nvram_params(struct platform_powerpc *platform, char *buf, int len) { @@ -110,7 +74,6 @@ static int parse_nvram_params(struct platform_powerpc *platform, for (pos = buf + i; pos < buf + len; pos += paramlen + 1) { unsigned int namelen; - struct param *param; char *newline; newline = strchr(pos, '\n'); @@ -130,16 +93,12 @@ static int parse_nvram_params(struct platform_powerpc *platform, if (namelen == 0) continue; - if (!param_is_known(name, namelen)) + if (!param_list_is_known_n(&platform->params, name, namelen)) continue; value++; - param = talloc(platform, struct param); - param->modified = false; - param->name = talloc_strndup(platform, name, namelen); - param->value = talloc_strdup(platform, value); - list_add(&platform->params, ¶m->list); + param_list_set(&platform->params, name, value, false); } return 0; @@ -189,7 +148,7 @@ static int write_nvram(struct platform_powerpc *platform) process->path = "nvram"; process->argv = argv; - list_for_each_entry(&platform->params, param, list) { + param_list_for_each(&platform->params, param) { char *paramstr; if (!param->modified) @@ -215,43 +174,6 @@ static int write_nvram(struct platform_powerpc *platform) return rc; } -static const char *get_param(struct platform_powerpc *platform, - const char *name) -{ - struct param *param; - - list_for_each_entry(&platform->params, param, list) - if (!strcmp(param->name, name)) - return param->value; - return NULL; -} - -static void set_param(struct platform_powerpc *platform, const char *name, - const char *value) -{ - struct param *param; - - list_for_each_entry(&platform->params, param, list) { - if (strcmp(param->name, name)) - continue; - - if (!strcmp(param->value, value)) - return; - - talloc_free(param->value); - param->value = talloc_strdup(param, value); - param->modified = true; - return; - } - - - param = talloc(platform, struct param); - param->modified = true; - param->name = talloc_strdup(platform, name); - param->value = talloc_strdup(platform, value); - list_add(&platform->params, ¶m->list); -} - static int parse_hwaddr(struct interface_config *ifconf, char *str) { int i; @@ -277,8 +199,7 @@ static int parse_hwaddr(struct interface_config *ifconf, char *str) return 0; } -static int parse_one_interface_config(struct config *config, - char *confstr) +static int parse_one_interface_config(struct config *config, char *confstr) { struct interface_config *ifconf; char *tok, *tok_gw, *tok_url, *saveptr; @@ -352,8 +273,7 @@ out_err: return -1; } -static int parse_one_dns_config(struct config *config, - char *confstr) +static int parse_one_dns_config(struct config *config, char *confstr) { char *tok, *saveptr = NULL; @@ -373,14 +293,11 @@ static int parse_one_dns_config(struct config *config, return 0; } -static void populate_network_config(struct platform_powerpc *platform, - struct config *config) +static void populate_network_config(struct config *config, const char *cval) { char *val, *saveptr = NULL; - const char *cval; int i; - cval = get_param(platform, "petitboot,network"); if (!cval || !strlen(cval)) return; @@ -445,8 +362,8 @@ static int read_bootdev(void *ctx, char **pos, struct autoboot_option *opt) return rc; } -static void populate_bootdev_config(struct platform_powerpc *platform, - struct config *config) +static void populate_bootdev_config(struct config *config, + const struct param_list *pl) { struct autoboot_option *opt, *new = NULL; char *pos, *end; @@ -454,7 +371,7 @@ static void populate_bootdev_config(struct platform_powerpc *platform, const char *val; /* Check for ordered bootdevs */ - val = get_param(platform, "petitboot,bootdevs"); + val = param_list_get_value(pl, "petitboot,bootdevs"); if (!val || !strlen(val)) { pos = end = NULL; } else { @@ -494,8 +411,7 @@ static void populate_bootdev_config(struct platform_powerpc *platform, config->n_autoboot_opts = n_new; } -static void populate_config(struct platform_powerpc *platform, - struct config *config) +static void populate_config(struct config *config, const struct param_list *pl) { const char *val; char *end; @@ -503,10 +419,10 @@ static void populate_config(struct platform_powerpc *platform, /* if the "auto-boot?' property is present and "false", disable auto * boot */ - val = get_param(platform, "auto-boot?"); + val = param_list_get_value(pl, "auto-boot?"); config->autoboot_enabled = !val || strcmp(val, "false"); - val = get_param(platform, "petitboot,timeout"); + val = param_list_get_value(pl, "petitboot,timeout"); if (val) { timeout = strtoul(val, &end, 10); if (end != val) { @@ -516,37 +432,38 @@ static void populate_config(struct platform_powerpc *platform, } } - val = get_param(platform, "petitboot,language"); + val = param_list_get_value(pl, "petitboot,language"); config->lang = val ? talloc_strdup(config, val) : NULL; - populate_network_config(platform, config); + val = param_list_get_value(pl, "petitboot,network"); + populate_network_config(config, val); - populate_bootdev_config(platform, config); + populate_bootdev_config(config, pl); if (!config->debug) { - val = get_param(platform, "petitboot,debug?"); + val = param_list_get_value(pl, "petitboot,debug?"); config->debug = val && !strcmp(val, "true"); } - val = get_param(platform, "petitboot,write?"); + val = param_list_get_value(pl, "petitboot,write?"); if (val) config->allow_writes = !strcmp(val, "true"); - val = get_param(platform, "petitboot,snapshots?"); + val = param_list_get_value(pl, "petitboot,snapshots?"); if (val) config->disable_snapshots = !strcmp(val, "false"); - val = get_param(platform, "petitboot,console"); + val = param_list_get_value(pl, "petitboot,console"); if (val) config->boot_console = talloc_strdup(config, val); /* If a full path is already set we don't want to override it */ config->manual_console = config->boot_console && !strchr(config->boot_console, '['); - val = get_param(platform, "petitboot,http_proxy"); + val = param_list_get_value(pl, "petitboot,http_proxy"); if (val) config->http_proxy = talloc_strdup(config, val); - val = get_param(platform, "petitboot,https_proxy"); + val = param_list_get_value(pl, "petitboot,https_proxy"); if (val) config->https_proxy = talloc_strdup(config, val); } @@ -594,22 +511,8 @@ static char *dns_config_str(void *ctx, const char **dns_servers, int n) return str; } -static void update_string_config(struct platform_powerpc *platform, - const char *name, const char *value) -{ - const char *cur; - - cur = get_param(platform, name); - - /* don't set an empty parameter if it doesn't already exist */ - if (!cur && !strlen(value)) - return; - - set_param(platform, name, value); -} - -static void update_network_config(struct platform_powerpc *platform, - const char *param_name, const struct config *config) +static void update_network_config(struct param_list *pl, const char *param_name, + const struct config *config) { unsigned int i; char *val; @@ -623,10 +526,10 @@ static void update_network_config(struct platform_powerpc *platform, config->network.interfaces[0]->override) return; - val = talloc_strdup(platform, ""); + val = talloc_strdup(pl, ""); for (i = 0; i < config->network.n_interfaces; i++) { - char *iface_str = iface_config_str(platform, + char *iface_str = iface_config_str(pl, config->network.interfaces[i]); val = talloc_asprintf_append(val, "%s%s", *val == '\0' ? "" : " ", iface_str); @@ -634,7 +537,7 @@ static void update_network_config(struct platform_powerpc *platform, } if (config->network.n_dns_servers) { - char *dns_str = dns_config_str(platform, + char *dns_str = dns_config_str(pl, config->network.dns_servers, config->network.n_dns_servers); val = talloc_asprintf_append(val, "%s%s", @@ -642,13 +545,12 @@ static void update_network_config(struct platform_powerpc *platform, talloc_free(dns_str); } - update_string_config(platform, param_name, val); - + param_list_set_non_empty(pl, param_name, val, true); talloc_free(val); } -static void update_bootdev_config(struct platform_powerpc *platform, - const char *param_name, const struct config *config) +static void update_bootdev_config(struct param_list *pl, const char *param_name, + const struct config *config) { char *val = NULL, *boot_str = NULL, *tmp = NULL; struct autoboot_option *opt; @@ -674,14 +576,14 @@ static void update_bootdev_config(struct platform_powerpc *platform, tmp = val = talloc_asprintf_append(val, "%s", boot_str); } - update_string_config(platform, param_name, val); + param_list_set_non_empty(pl, param_name, val, true); talloc_free(tmp); if (boot_str) talloc_free(boot_str); } -static void update_config(struct platform_powerpc *platform, - struct config *config, struct config *defaults) +static void update_config(struct param_list *pl, struct config *config, + const struct config *defaults) { char *tmp = NULL; const char *val; @@ -690,40 +592,40 @@ static void update_config(struct platform_powerpc *platform, val = ""; else val = config->autoboot_enabled ? "true" : "false"; - update_string_config(platform, "auto-boot?", val); + + param_list_set_non_empty(pl, "auto-boot?", val, true); if (config->autoboot_timeout_sec == defaults->autoboot_timeout_sec) val = ""; else - val = tmp = talloc_asprintf(platform, "%d", - config->autoboot_timeout_sec); + val = tmp = talloc_asprintf(pl, "%d", + config->autoboot_timeout_sec); - update_string_config(platform, "petitboot,timeout", val); + param_list_set_non_empty(pl, "petitboot,timeout", val, true); if (tmp) talloc_free(tmp); val = config->lang ?: ""; - update_string_config(platform, "petitboot,language", val); + param_list_set_non_empty(pl, "petitboot,language", val, true); if (config->allow_writes == defaults->allow_writes) val = ""; else val = config->allow_writes ? "true" : "false"; - update_string_config(platform, "petitboot,write?", val); + param_list_set_non_empty(pl, "petitboot,write?", val, true); if (!config->manual_console) { val = config->boot_console ?: ""; - update_string_config(platform, "petitboot,console", val); + param_list_set_non_empty(pl, "petitboot,console", val, true); } val = config->http_proxy ?: ""; - update_string_config(platform, "petitboot,http_proxy", val); + param_list_set_non_empty(pl, "petitboot,http_proxy", val, true); val = config->https_proxy ?: ""; - update_string_config(platform, "petitboot,https_proxy", val); - - update_network_config(platform, "petitboot,network", config); + param_list_set_non_empty(pl, "petitboot,https_proxy", val, true); - update_bootdev_config(platform, "petitboot,bootdevs", config); + update_network_config(pl, "petitboot,network", config); + update_bootdev_config(pl, "petitboot,bootdevs", config); } static void set_ipmi_bootdev(struct config *config, enum ipmi_bootdev bootdev, @@ -1071,7 +973,8 @@ static void get_ipmi_network_override(struct platform_powerpc *platform, if (!rc && persistent) { /* Write this new config to NVRAM */ - update_network_config(platform, "petitboot,network", config); + update_network_config(&platform->params, "petitboot,network", + config); rc = write_nvram(platform); if (rc) pb_log("platform: Failed to save persistent interface override\n"); @@ -1120,7 +1023,7 @@ static int load_config(struct platform *p, struct config *config) if (rc) pb_log_fn("Failed to parse nvram\n"); - populate_config(platform, config); + populate_config(config, &platform->params); if (platform->get_ipmi_bootdev) { bool bootdev_persistent; @@ -1156,7 +1059,7 @@ static int save_config(struct platform *p, struct config *config) defaults = talloc_zero(platform, struct config); config_set_defaults(defaults); - update_config(platform, config, defaults); + update_config(&platform->params, config, defaults); talloc_free(defaults); return write_nvram(platform); @@ -1220,7 +1123,7 @@ static bool probe(struct platform *p, void *ctx) return false; platform = talloc_zero(ctx, struct platform_powerpc); - list_init(&platform->params); + param_list_init(&platform->params, common_known_params()); p->platform_data = platform;