coreboot-gerrit January 2016

coreboot-gerrit@coreboot.org

1 participants
2471 discussions

Patch set updated for coreboot: Braswell: Implement Gpio library functions to read RAMID
by Hannah Williams 25 Jan '16

25 Jan '16

Hannah Williams (hannah.williams(a)intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12735 -gerrit commit 68af7a3c8511fea90eb7f7e4164f2a720dec60c9 Author: Subrata Banik <subrata.banik(a)intel.com> Date: Sat Aug 22 10:36:41 2015 +0530 Braswell: Implement Gpio library functions to read RAMID Added GPIO library code to allow all BSW board specific code to use memory configuration GPIOs in GPIO Input mode and read them to determine which memory type is on the board. Also added other GPIO related APIs to support GPIO access in BSW. Original-Reviewed-on: https://chromium-review.googlesource.com/294893 Original-Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> Change-Id: Idd65136c0449f0cdebfae12a510985e29889fa2b Signed-off-by: Subrata Banik <subrata.banik(a)intel.com> Signed-off-by: Hannah Williams <hannah.williams(a)intel.com> --- src/soc/intel/braswell/Makefile.inc | 1 + src/soc/intel/braswell/gpio_support.c | 91 +++++++++- src/soc/intel/braswell/include/soc/gpio.h | 13 ++ src/soc/intel/braswell/include/soc/gpio_defs.h | 219 +++++++++++++++++++++++++ 4 files changed, 321 insertions(+), 3 deletions(-) diff --git a/src/soc/intel/braswell/Makefile.inc b/src/soc/intel/braswell/Makefile.inc index b61323d..4a107ec 100644 --- a/src/soc/intel/braswell/Makefile.inc +++ b/src/soc/intel/braswell/Makefile.inc @@ -23,6 +23,7 @@ ramstage-y += gpio.c ifeq ($(CONFIG_GOP_SUPPORT),n) ramstage-y += gfx.c endif +ramstage-y += gpio_support.c ramstage-y += hda.c ramstage-y += iosf.c ramstage-y += lpe.c diff --git a/src/soc/intel/braswell/gpio_support.c b/src/soc/intel/braswell/gpio_support.c index 34e0196..14c4663 100644 --- a/src/soc/intel/braswell/gpio_support.c +++ b/src/soc/intel/braswell/gpio_support.c @@ -12,7 +12,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ - +#include <gpio.h> #include <console/console.h> #include <soc/gpio.h> @@ -71,12 +71,97 @@ uint32_t *gpio_pad_config_reg(uint8_t community, uint8_t pad) * Refer to BSW BIOS Writers Guide, Table "Per Pad Memory Space * Registers Addresses" for the Pad configuration register calculation. */ - pad_config_reg = (uint32_t *)(COMMUNITY_BASE(community) + 0x4400 + - (0x400 * (fpad >> 8)) + (8 * (fpad & 0xff))); + pad_config_reg = (uint32_t *)(COMMUNITY_BASE(community) + + FAMILY_PAD_REGS_OFF + (FAMILY_PAD_REGS_SIZE * (fpad >> 8)) + + (GPIO_REGS_SIZE * (fpad & 0xff))); return pad_config_reg; } +static int gpio_get_community_num(gpio_t gpio_num, int *pad) +{ + int comm = 0; + + if (gpio_num >= GP_SW_00 && gpio_num <= GP_SW_97) { + comm = GP_SOUTHWEST; + *pad = gpio_num % GP_SOUTHWEST_COUNT; + } else if (gpio_num >= GP_NC_00 && gpio_num <= GP_NC_72) { + comm = GP_NORTH; + *pad = gpio_num % GP_SOUTHWEST_COUNT; + } else if (gpio_num >= GP_E_00 && gpio_num <= GP_E_26) { + comm = GP_EAST; + *pad = gpio_num % + (GP_SOUTHWEST_COUNT + GP_NORTH_COUNT); + } else { + comm = GP_SOUTHEAST; + *pad = gpio_num % (GP_SOUTHWEST_COUNT + + GP_NORTH_COUNT + GP_EAST_COUNT); + } + return comm; +} + +static void gpio_config_pad(gpio_t gpio_num, const struct soc_gpio_map *cfg) +{ + int comm = 0; + int pad_num =0; + uint32_t *pad_config0_reg; + uint32_t *pad_config1_reg; + int max_gpio_cnt = GP_SOUTHWEST_COUNT + GP_NORTH_COUNT + GP_EAST_COUNT + + GP_SOUTHEAST_COUNT; + + if(gpio_num > max_gpio_cnt) + return; + /* Get GPIO Community based on GPIO_NUMBER */ + comm = gpio_get_community_num(gpio_num, &pad_num); + /* CONF0 */ + pad_config0_reg = gpio_pad_config_reg(comm, pad_num); + /* CONF1 */ + pad_config1_reg = pad_config0_reg + 1; + + write32(pad_config0_reg, cfg->pad_conf0); + write32(pad_config1_reg, cfg->pad_conf1); +} + +void gpio_input_pullup(gpio_t gpio_num) +{ + struct soc_gpio_map cfg = GPIO_INPUT_PU_20K; + gpio_config_pad(gpio_num, &cfg); +} + +void gpio_input_pulldown(gpio_t gpio_num) +{ + struct soc_gpio_map cfg = GPIO_INPUT_PD_20K; + gpio_config_pad(gpio_num, &cfg); +} + +void gpio_input(gpio_t gpio_num) +{ + struct soc_gpio_map cfg = GPIO_INPUT_NO_PULL; + gpio_config_pad(gpio_num, &cfg); +} + +int gpio_get(gpio_t gpio_num) +{ + int comm = 0; + int pad_num =0; + uint32_t *pad_config0_reg; + u32 pad_value; + int max_gpio_cnt = GP_SOUTHWEST_COUNT + GP_NORTH_COUNT + GP_EAST_COUNT + + GP_SOUTHEAST_COUNT; + + if(gpio_num > max_gpio_cnt) + return -1; + + /* Get GPIO Community based on GPIO_NUMBER */ + comm = gpio_get_community_num(gpio_num, &pad_num); + /* CONF0 */ + pad_config0_reg = gpio_pad_config_reg(comm, pad_num); + + pad_value = read32(pad_config0_reg); + + return pad_value & PAD_RX_BIT; +} + int get_gpio(int community_base, int pad0_offset) { return (read32((void *)(community_base + pad0_offset))) & PAD_RX_BIT; diff --git a/src/soc/intel/braswell/include/soc/gpio.h b/src/soc/intel/braswell/include/soc/gpio.h index 08cfd0c..11110c9 100644 --- a/src/soc/intel/braswell/include/soc/gpio.h +++ b/src/soc/intel/braswell/include/soc/gpio.h @@ -19,6 +19,7 @@ #include <stdint.h> #include <arch/io.h> +#include <soc/gpio_defs.h> #include <soc/iomap.h> #define COMMUNITY_SIZE 0x20000 @@ -235,6 +236,16 @@ | PAD_CONFIG0_GPI_DEFAULT, \ .pad_conf1 = PAD_CONFIG1_DEFAULT0 } +#define GPIO_INPUT_PD_5K \ + { .pad_conf0 = PAD_PULL_DOWN_5K | PAD_GPIO_ENABLE \ + | PAD_CONFIG0_GPI_DEFAULT, \ + .pad_conf1 = PAD_CONFIG1_DEFAULT0 } + +#define GPIO_INPUT_PD_20K \ + { .pad_conf0 = PAD_PULL_DOWN_20K | PAD_GPIO_ENABLE \ + | PAD_CONFIG0_GPI_DEFAULT, \ + .pad_conf1 = PAD_CONFIG1_DEFAULT0 } + #define GPIO_INPUT_PU_5K \ { .pad_conf0 = PAD_PULL_UP_5K | PAD_GPIO_ENABLE \ | PAD_CONFIG0_GPI_DEFAULT, \ @@ -567,6 +578,8 @@ static inline void ssus_disable_internal_pull(int pad) { } +typedef int gpio_t; + int get_gpio(int community_base, int pad0_offset); uint16_t gpio_family_number(uint8_t community, uint8_t pad); uint32_t *gpio_pad_config_reg(uint8_t community, uint8_t pad); diff --git a/src/soc/intel/braswell/include/soc/gpio_defs.h b/src/soc/intel/braswell/include/soc/gpio_defs.h new file mode 100644 index 0000000..c6a3c3b --- /dev/null +++ b/src/soc/intel/braswell/include/soc/gpio_defs.h @@ -0,0 +1,219 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2013 Google Inc. + * Copyright (C) 2016 Intel Corp. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef _SOC_GPIO_DEFS_H_ +#define _SOC_GPIO_DEFS_H_ + +/* GPSOUTHWEST */ +#define GP_SW_00 0 +#define GP_SW_01 1 +#define GP_SW_02 2 +#define GP_SW_03 3 +#define GP_SW_04 4 +#define GP_SW_05 5 +#define GP_SW_06 6 +#define GP_SW_07 7 +#define GP_SW_15 8 +#define GP_SW_16 9 +#define GP_SW_17 10 +#define GP_SW_18 11 +#define GP_SW_19 12 +#define GP_SW_20 13 +#define GP_SW_21 14 +#define GP_SW_22 15 +#define GP_SW_30 16 +#define GP_SW_31 17 +#define GP_SW_32 18 +#define GP_SW_33 19 +#define GP_SW_34 20 +#define GP_SW_35 21 +#define GP_SW_36 22 +#define GP_SW_37 23 +#define GP_SW_45 24 +#define GP_SW_46 25 +#define GP_SW_47 26 +#define GP_SW_48 27 +#define GP_SW_49 28 +#define GP_SW_50 29 +#define GP_SW_51 30 +#define GP_SW_52 31 +#define GP_SW_60 32 +#define GP_SW_61 33 +#define GP_SW_62 34 +#define GP_SW_63 35 +#define GP_SW_64 36 +#define GP_SW_65 37 +#define GP_SW_66 38 +#define GP_SW_67 39 +#define GP_SW_75 40 +#define GP_SW_76 41 +#define GP_SW_77 42 +#define GP_SW_78 43 +#define GP_SW_79 44 +#define GP_SW_80 45 +#define GP_SW_81 46 +#define GP_SW_82 47 +#define GP_SW_90 48 +#define GP_SW_91 49 +#define GP_SW_92 50 +#define GP_SW_93 51 +#define GP_SW_94 52 +#define GP_SW_95 53 +#define GP_SW_96 54 +#define GP_SW_97 55 +/* GPNORTH */ +#define GP_NC_00 56 +#define GP_NC_01 57 +#define GP_NC_02 58 +#define GP_NC_03 59 +#define GP_NC_04 60 +#define GP_NC_05 61 +#define GP_NC_06 62 +#define GP_NC_07 63 +#define GP_NC_08 64 +#define GP_NC_15 65 +#define GP_NC_16 66 +#define GP_NC_17 67 +#define GP_NC_18 68 +#define GP_NC_19 69 +#define GP_NC_20 70 +#define GP_NC_21 71 +#define GP_NC_22 72 +#define GP_NC_23 73 +#define GP_NC_24 74 +#define GP_NC_25 75 +#define GP_NC_26 76 +#define GP_NC_27 77 +#define GP_NC_30 78 +#define GP_NC_31 79 +#define GP_NC_32 80 +#define GP_NC_33 81 +#define GP_NC_34 82 +#define GP_NC_35 83 +#define GP_NC_36 84 +#define GP_NC_37 85 +#define GP_NC_38 86 +#define GP_NC_39 87 +#define GP_NC_40 88 +#define GP_NC_41 89 +#define GP_NC_45 90 +#define GP_NC_46 91 +#define GP_NC_47 92 +#define GP_NC_48 93 +#define GP_NC_49 94 +#define GP_NC_50 95 +#define GP_NC_51 96 +#define GP_NC_52 97 +#define GP_NC_53 98 +#define GP_NC_54 99 +#define GP_NC_55 100 +#define GP_NC_56 101 +#define GP_NC_60 102 +#define GP_NC_61 103 +#define GP_NC_62 104 +#define GP_NC_63 105 +#define GP_NC_64 106 +#define GP_NC_65 107 +#define GP_NC_66 108 +#define GP_NC_67 119 +#define GP_NC_68 110 +#define GP_NC_69 111 +#define GP_NC_70 112 +#define GP_NC_71 113 +#define GP_NC_72 114 +/* GPEAST */ +#define GP_E_00 115 +#define GP_E_01 116 +#define GP_E_02 117 +#define GP_E_03 118 +#define GP_E_04 119 +#define GP_E_05 120 +#define GP_E_06 121 +#define GP_E_07 122 +#define GP_E_08 123 +#define GP_E_09 124 +#define GP_E_10 125 +#define GP_E_11 126 +#define GP_E_15 127 +#define GP_E_16 128 +#define GP_E_17 129 +#define GP_E_18 130 +#define GP_E_19 131 +#define GP_E_20 132 +#define GP_E_21 133 +#define GP_E_22 134 +#define GP_E_23 135 +#define GP_E_24 136 +#define GP_E_25 137 +#define GP_E_26 138 +/* GPSOUTHEAST */ +#define GP_SE_00 139 +#define GP_SE_01 140 +#define GP_SE_02 141 +#define GP_SE_03 142 +#define GP_SE_04 143 +#define GP_SE_05 144 +#define GP_SE_06 145 +#define GP_SE_07 146 +#define GP_SE_15 147 +#define GP_SE_16 148 +#define GP_SE_17 149 +#define GP_SE_18 150 +#define GP_SE_19 151 +#define GP_SE_20 152 +#define GP_SE_21 153 +#define GP_SE_22 154 +#define GP_SE_23 155 +#define GP_SE_24 156 +#define GP_SE_25 157 +#define GP_SE_26 158 +#define GP_SE_30 159 +#define GP_SE_31 160 +#define GP_SE_32 161 +#define GP_SE_33 162 +#define GP_SE_34 163 +#define GP_SE_35 164 +#define GP_SE_45 165 +#define GP_SE_46 166 +#define GP_SE_47 167 +#define GP_SE_48 168 +#define GP_SE_49 169 +#define GP_SE_50 170 +#define GP_SE_51 171 +#define GP_SE_52 172 +#define GP_SE_60 173 +#define GP_SE_61 174 +#define GP_SE_62 175 +#define GP_SE_63 176 +#define GP_SE_64 177 +#define GP_SE_65 178 +#define GP_SE_66 179 +#define GP_SE_67 180 +#define GP_SE_68 181 +#define GP_SE_69 182 +#define GP_SE_75 183 +#define GP_SE_76 184 +#define GP_SE_77 185 +#define GP_SE_78 186 +#define GP_SE_79 187 +#define GP_SE_80 188 +#define GP_SE_81 189 +#define GP_SE_82 190 +#define GP_SE_83 191 +#define GP_SE_84 192 +#define GP_SE_85 193 + +#endif /* _SOC_GPIO_DEFS_H_ */

1 0

Patch merged into coreboot/master: arch/x86: move SetCodeSelector to .text segment
by gerrit＠coreboot.org 25 Jan '16

25 Jan '16

the following patch was just integrated into master: commit 546f29dbf1613d40b6b816a87aa3c144b1cd0b90 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Fri Jan 22 12:43:43 2016 +0100 arch/x86: move SetCodeSelector to .text segment It ended up in .data, and that doesn't seem to be actually necessary. Change-Id: Ib17d6f9870379d1b7ad7bbd3f16a0839b28f72c8 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> Reviewed-on: https://review.coreboot.org/13134 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Tested-by: Raptor Engineering Automated Test Stand <noreply(a)raptorengineeringinc.com> See https://review.coreboot.org/13134 for details. -gerrit

1 0

New patch to review for coreboot: kconfig_lint: Add readme document
by Martin Roth 25 Jan '16

25 Jan '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13464 -gerrit commit 9039750eb8a49d7f153d14499c23a107317d7b99 Author: Martin Roth <martinroth(a)google.com> Date: Mon Jan 25 20:10:14 2016 -0700 kconfig_lint: Add readme document The readme describes the operation and usage of kconfig_lint. It also lists all the notes, warnings, and errors that kconfig_lint looks for. Change-Id: I873f394ff93fce42cd9638cbbad6134f1aef3a6a Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/lint/kconfig_lint_README | 97 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/util/lint/kconfig_lint_README b/util/lint/kconfig_lint_README new file mode 100644 index 0000000..9076f4c --- /dev/null +++ b/util/lint/kconfig_lint_README @@ -0,0 +1,97 @@ +kconfig_lint is a tool to help identify issues within coreboot's Kconfig +files. It is very specific to coreboot, and is not intended to be used as a +generic Kconfig lint tool for other projects. + +Operation: +kconfig_lint parses the entire kconfig tree, building up a hash table of all +of the statements. It then searches the coreboot tree looking for all usage of +any Kconfig symbols. By combining these two, it is able to find many issues +that would be difficult to locate otherwise. + +Usage: +kconfig_lint <options> + -o|--output=file Set output filename + -p|--print Print full output + -e|--errors_off Don't print warnings or errors + -w|--warnings_off Don't print warnings + -n|--notes Show minor notes + -G|--no_git_grep Use standard grep tools instead of git grep + + +Options: + -o|--output=file Send the output to a file instead of printing to stdout. + + -p|--print Shows the entire Kconfig tree as parsed by kconfig_lint, + including the filename and line number of each statement. + This can be very helpful for debugging Kconfig issues. + + -e|--errors_off Suppress both error and warning output. Useful along with + the --print command + +-w|--warnings_off Suppress warning output + +-n|--notes Enable the display of minor notes that kconfig_lint has + found. These might be issues, but probably are not. + + -G|--no_git_grep Instead of using the 'git grep' command, use regular grep. + This is useful for checking coreboot trees that are not + contained in a git repo. + +Issues that kconfig_lint checks for: + +Notes: +- Show when the range set for a hex or int does not match a previous range + +Warnings in Kconfig files: +- Any 'default' expressions that can never be reached. +- Symbols that are defined but never used. +- Help text starting with no whitespace. +- Directories specified in a 'source' keyword do not exist. +- A 'source' keyword loading a Kconfig file that has already been loaded. +- A 'source' keyword loading a Kconfig file that doesn't exist. Note that + globs are excluded from this check. + +Warnings in coreboot source files: +- #define of Kconfig symbol - Symbols should only be defined in Kconfig. +- #define starting with 'CONFIG_' - these should be reserved for Kconfig + symbols. +- 'IS_ENABLED()' block that could not be interpreted. +- Kconfig files that are not loaded by a 'source' keyword. + +Errors in Kconfig files: +- Selects do not work on symbols created in a choice block. +- All symbols used in selects or expressions must be defined in a config + statement. +- 'endchoice' keyword not used in a choice block +- Choice block defined with no symbols. +- The 'tristate' type is not used in coreboot. +- A 'select' keyword used outside of a config block. +- Symbols created both inside and outside of a choice block. +- A 'range' keyword has higher minimum than maximum value. +- A config block with a prompt at the top level (the top level is currently + just for menus). +- Indentation using spaces instead of tabs. We indent using tabs, although + the tab may be followed by spaces, particularly for help blocks. +- Lines not ending with a linefeed. These can cause some keywords to not + function properly ('source' keywords in particular). It's also just + generally good to end the file with a linefeed. + +Errors in Kconfig that are also caught by Kconfig itself: +- Invalid expressions. +- Unrecognized keywords. +- An 'optional' keyword used outside of a choice block +- The 'select' keyword only works on bool symbols. +- A 'range' keyword used outside of a config block. +- A 'default' keyword used outside of a config or choice block. +- Symbol types must be consistent - they cannot be bool in one location and + int in another location. +- Type keywords (bool, int, hex, string) used outside of a config block. +- Using a 'prompt' keyword not inside a config or choice block. + +Errors in coreboot source files: +- '#ifdef' or '#if defined' used on bool, int, or hex - these are always + defined in coreboot's version of Kconfig. +- The IS_ENABLED macro is only valid for bool symbols. +- The IS_ENABLED used on unknown CONFIG_ value, like an obsolete symbol. + +TODO: check for choice entries at the top level

1 0

New patch to review for coreboot: kconfig_lint: add comments and whitespace fixes.
by Martin Roth 25 Jan '16

25 Jan '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13463 -gerrit commit 15c7b88a2e1a071692b104b76fd79a6b4a8c6e47 Author: Martin Roth <martinroth(a)google.com> Date: Mon Jan 25 19:54:16 2016 -0700 kconfig_lint: add comments and whitespace fixes. No functional changes. Change-Id: I40284b68ddda7e19741c5306a8c74761c00e4b35 Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/lint/kconfig_lint | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/util/lint/kconfig_lint b/util/lint/kconfig_lint index bec86e4..adb42c8 100755 --- a/util/lint/kconfig_lint +++ b/util/lint/kconfig_lint @@ -42,14 +42,14 @@ my $exclude_dirs_and_files = '^build/\|^coreboot-builds/\|^payloads/libpayload\|^payloads/coreinfo\|^configs/\|^util/\|^\.git/' . '\|' . # directories to exclude when searching for used symbols '\.txt$\|\.tex$\|\.tags'; #files to exclude when looking for symbols -my $config_file = ""; # name of config file to load symbol values from. -my @wholeconfig; # document the entire kconfig structure -my %loaded_files; # list of each Kconfig file loaded -my %symbols; # main structure of all symbols declared -my %referenced_symbols; # list of symbols referenced by expressions or select statements -my %used_symbols; # structure of symbols used in the tree, and where they're found -my @collected_symbols; # -my %selected_symbols; # list of symbols that are enabled by a select statement +my $config_file = ""; # name of config file to load symbol values from. +my @wholeconfig; # document the entire kconfig structure +my %loaded_files; # list of each Kconfig file loaded +my %symbols; # main structure of all symbols declared +my %referenced_symbols; # list of symbols referenced by expressions or select statements +my %used_symbols; # structure of symbols used in the tree, and where they're found +my @collected_symbols; # +my %selected_symbols; # list of symbols that are enabled by a select statement my $exclude_unused = '_SPECIFIC_OPTIONS|SOUTH_BRIDGE_OPTIONS'; @@ -419,7 +419,6 @@ sub build_and_parse_kconfig_tree { #start the tree off by loading the top level kconfig @config_to_parse = load_kconfig_file( $top_level_kconfig, "", 0, 0, "", 0 ); - while ( ( @parseline = shift(@config_to_parse) ) && ( exists $parseline[0]{text} ) ) { my $line = $parseline[0]{text}; my $filename = $parseline[0]{filename}; @@ -504,6 +503,8 @@ sub build_and_parse_kconfig_tree { $inside_config = ""; $inside_choice = "$filename $line_no"; $configs_inside_choice = 0; + + # Kconfig verifies that choice blocks have a prompt } # endchoice @@ -535,6 +536,10 @@ sub build_and_parse_kconfig_tree { # mainmenu <prompt> elsif ( $line =~ /^\s*mainmenu/ ) { $inside_config = ""; + + # Kconfig alread checks for multiple 'mainmenu' entries and mainmenu entries with no prompt + # Possible check: look for 'mainmenu ""' + # Possible check: verify that a mainmenu has been specified } # menu <prompt> @@ -564,7 +569,6 @@ sub build_and_parse_kconfig_tree { my $expr = $1; push( @inside_if, $expr ); handle_expressions( $expr, $inside_config, $filename, $line_no ); - } # endif @@ -679,7 +683,6 @@ sub add_symbol { } } - # add the location of this instance my $symcount = $symbols{$symbol}{count}; $symbols{$symbol}{$symcount}{file} = $filename; @@ -987,6 +990,7 @@ sub handle_prompt { $prompt = $1; } + #display an error if there's a prompt at the top menu level if ( !defined @$menu_array_ref[0] ) { show_error( "Symbol '$inside_config' with prompt '$prompt' appears outside of a menu" . " at $filename:$line_no." ); @@ -1145,7 +1149,6 @@ sub load_kconfig_file { return @dir_file_data; } - #------------------------------------------------------------------------------- # print_wholeconfig - prints out the parsed Kconfig file #-------------------------------------------------------------------------------

1 0

New patch to review for coreboot: kconfig_lint: Skip temp files when looking for unused Kconfig files.
by Martin Roth 25 Jan '16

25 Jan '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13462 -gerrit commit 9a9679515997e915a23f98caf903cf956a2112af Author: Martin Roth <martinroth(a)google.com> Date: Mon Jan 25 16:45:14 2016 -0700 kconfig_lint: Skip temp files when looking for unused Kconfig files. Don't warn on Kconfig.orig and Kconfig~ files when trying to verify that all the Kconfig files in the coreboot source tree are being loaded. Change-Id: Ie7babe60b29735e5ccc5f93f4e42ad82dfb47044 Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/lint/kconfig_lint | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/util/lint/kconfig_lint b/util/lint/kconfig_lint index 2fbaf97..bec86e4 100755 --- a/util/lint/kconfig_lint +++ b/util/lint/kconfig_lint @@ -1168,7 +1168,11 @@ sub print_wholeconfig { #------------------------------------------------------------------------------- sub check_if_file_referenced { my $filename = $File::Find::name; - if ( ( $filename =~ /Kconfig/ ) && ( !exists $loaded_files{$filename} ) ) { + if ( ( $filename =~ /Kconfig/ ) + && ( !$filename =~ /\.orig$/ ) + && ( !$filename =~ /~$/ ) + && ( !exists $loaded_files{$filename} ) ) + { show_warning("'$filename' is never referenced"); } }

1 0

New patch to review for coreboot: kconfig_lint: Update prompt structure
by Martin Roth 25 Jan '16

25 Jan '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13461 -gerrit commit b778d64b2a8ffb768c907b5d986b8a6b26384453 Author: Martin Roth <martinroth(a)google.com> Date: Mon Jan 25 16:42:13 2016 -0700 kconfig_lint: Update prompt structure - The prompts were not getting incremented, so each prompt for a symbol would overwrite the previous. - Record the menu each prompt is in. Change-Id: Ia282a30344d5e135f4f2027be9aff0e49a4e5edb Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/lint/kconfig_lint | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/util/lint/kconfig_lint b/util/lint/kconfig_lint index 8bdca8d..2fbaf97 100755 --- a/util/lint/kconfig_lint +++ b/util/lint/kconfig_lint @@ -993,12 +993,17 @@ sub handle_prompt { } my $sym_num = $symbols{$inside_config}{count}; - unless ( exists $symbols{$inside_config}{$sym_num}{prompt_max} ) { + if ( !exists $symbols{$inside_config}{$sym_num}{prompt_max} ) { $symbols{$inside_config}{$sym_num}{prompt_max} = 0; } + else { + $symbols{$inside_config}{$sym_num}{prompt_max}++; + } my $prompt_max = $symbols{$inside_config}{$sym_num}{prompt_max}; $symbols{$inside_config}{$sym_num}{prompt}{$prompt_max}{prompt} = $prompt; $symbols{$inside_config}{$sym_num}{prompt}{$prompt_max}{prompt_line_no} = $line_no; + + $symbols{$inside_config}{$sym_num}{prompt}{$prompt_max}{prompt_menu} = @$menu_array_ref; if ($expression) { $symbols{$inside_config}{$sym_num}{prompt}{$prompt_max}{prompt_depends_on} = $expression; }

1 0

New patch to review for coreboot: kconfig_ling: Add warning if tristate type is used in coreboot
by Martin Roth 25 Jan '16

25 Jan '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13460 -gerrit commit e320cd2b73cc29cb792405a89e168e2baf49ddba Author: Martin Roth <martinroth(a)google.com> Date: Mon Jan 25 16:39:32 2016 -0700 kconfig_ling: Add warning if tristate type is used in coreboot Although there's no reason we COULDN"T use tristate types, we haven't up to this point. If there's a good reason to use them in the future, this check can be removed. Change-Id: I5f1903341f522bc957e394bc0fd288ba1adab431 Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/lint/kconfig_lint | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/util/lint/kconfig_lint b/util/lint/kconfig_lint index 9384336..8bdca8d 100755 --- a/util/lint/kconfig_lint +++ b/util/lint/kconfig_lint @@ -949,6 +949,10 @@ sub handle_type { my $expression; ( $type, $expression ) = handle_if_line( $type, $inside_config, $filename, $line_no ); + if ( $type =~ /tristate/ ) { + show_warning("$filename:$line_no - tristate types are not used."); + } + if ($inside_config) { if ( exists( $symbols{$inside_config}{type} ) ) { if ( $symbols{$inside_config}{type} !~ /$type/ ) {

1 0

New patch to review for coreboot: kconfig_lint: merge 'git grep' and 'grep' exclude dir and files
by Martin Roth 25 Jan '16

25 Jan '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13459 -gerrit commit 067e885fda87ed78d825f8884e8cf26da5b518bb Author: Martin Roth <martinroth(a)google.com> Date: Mon Jan 25 16:38:05 2016 -0700 kconfig_lint: merge 'git grep' and 'grep' exclude dir and files The code had originally been using standard grep to look through the coreboot tree for Kconfig symbols. When this was switched to git grep, the --exclude-dir options didn't work, and nothing was added to exclude the directories that shouldn't be searched for symbols. This resulted in invalid warnings as it searched directories that had Kconfig symbols for other projects. This merges the exclusion list for both the regular and git versions of grep for consistent behavior. Change-Id: I7fed8b9fa827cb14f7373e7b774acc56e43cb6ff Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/lint/kconfig_lint | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/util/lint/kconfig_lint b/util/lint/kconfig_lint index 2cb125e..9384336 100755 --- a/util/lint/kconfig_lint +++ b/util/lint/kconfig_lint @@ -612,6 +612,21 @@ sub build_and_parse_kconfig_tree { show_error("$line ($filename:$line_no unrecognized)"); } + if ( defined $inside_menu[0] ) { + $parseline[0]{menus} = ""; + } + else { + $parseline[0]{menus} = "top"; + } + + my $i = 0; + while ( defined $inside_menu[$i] ) { + $parseline[0]{menus} .= "$inside_menu[$i]"; + $i++; + if ( defined $inside_menu[$i] ) { + $parseline[0]{menus} .= "->"; + } + } push @wholeconfig, @parseline; } } @@ -1135,7 +1150,7 @@ sub print_wholeconfig { #replace tabs with spaces for consistency $line->{text} =~ s/\t/ /g; - printf "%-120s # $line->{filename} line $line->{file_line_no}\n", $line->{text}; + printf "%-120s # $line->{filename} line $line->{file_line_no} ($line->{menus})\n", $line->{text}; } }

1 0

New patch to review for coreboot: kconfig_lint: Don't look at IS_ENABLED() text in comments.
by Martin Roth 25 Jan '16

25 Jan '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13458 -gerrit commit fac977babdc0ae4dff102c010f0cea16fbd9b0bc Author: Martin Roth <martinroth(a)google.com> Date: Mon Jan 25 16:14:09 2016 -0700 kconfig_lint: Don't look at IS_ENABLED() text in comments. This fixes at least one kconfig_lint warning. Change-Id: I35edf57e90315a8372aaf3b41e923cd8dad7386a Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/lint/kconfig_lint | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/lint/kconfig_lint b/util/lint/kconfig_lint index 44e898f..2cb125e 100755 --- a/util/lint/kconfig_lint +++ b/util/lint/kconfig_lint @@ -253,7 +253,7 @@ sub check_is_enabled { my $file = $1; my $lineno = $2; $line = $3; - if ( $line !~ /(.*)IS_ENABLED\s*\(\s*CONFIG_(\w+)(.*)/ ) { + if ( ( $line !~ /(.*)IS_ENABLED\s*\(\s*CONFIG_(\w+)(.*)/ ) && ( $line !~ /(\/[\*\/])(.*)IS_ENABLED/ ) ) { show_warning("# uninterpreted IS_ENABLED at $file:$lineno: $line"); next; }

1 0

New patch to review for coreboot: kconfig_lint: Exclude some Kconfig symbols from unused symbol checks
by Martin Roth 25 Jan '16

25 Jan '16

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13457 -gerrit commit a70eaa603365ee9b36eec53af96a1f87ccf6ef07 Author: Martin Roth <martinroth(a)google.com> Date: Mon Jan 25 16:12:49 2016 -0700 kconfig_lint: Exclude some Kconfig symbols from unused symbol checks The configuration that coreboot uses for setting selected symbols typically involves a structure like this: config BLEH_SPECIFIC_OPTIONS def_bool y select SYMBOL This leads to an an extra kconfig symbol BLEH_SPECIFIC_OPTIONS that is never referenced by anything else, generating a warning. Since this is currently the construct that coreboot uses, filter it out of the warnings for now. Change-Id: I85a95e4c4e8469870c7f219f2a92955819845573 Signed-off-by: Martin Roth <martinroth(a)google.com> --- util/lint/kconfig_lint | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/util/lint/kconfig_lint b/util/lint/kconfig_lint index 4315768..44e898f 100755 --- a/util/lint/kconfig_lint +++ b/util/lint/kconfig_lint @@ -51,6 +51,8 @@ my %used_symbols; # structure of symbols used in the tree, and where th my @collected_symbols; # my %selected_symbols; # list of symbols that are enabled by a select statement +my $exclude_unused = '_SPECIFIC_OPTIONS|SOUTH_BRIDGE_OPTIONS'; + Main(); #------------------------------------------------------------------------------- @@ -380,6 +382,10 @@ sub check_used_symbols { # loop through all defined symbols and see if they're used anywhere foreach my $key ( sort ( keys %symbols ) ) { + if ( $key =~ /$exclude_unused/ ) { + next; + } + #see if they're used internal to Kconfig next if ( exists $referenced_symbols{$key} );

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit January 2016