coreboot-gerrit January 2017

coreboot-gerrit@coreboot.org

1 participants
852 discussions

New patch to review for coreboot: chromeec: Update Chrome EC submodule
by Martin Roth 03 Jan '17

03 Jan '17

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18023 -gerrit commit 20878be877b0eefee35a7ec4a8e0fdce209ccf5e Author: Martin Roth <martinroth(a)google.com> Date: Mon Jan 2 19:49:11 2017 -0700 chromeec: Update Chrome EC submodule Update to Chromium TOT with bcffec7fdc50e959cb298d094d8af472777dba75 292 commits between Oct 28, 2016 and Jan 2, 2017 Change-Id: I6bc356b9e458bebaa5839375ff40dd7e0d6ccff1 Signed-off-by: Martin Roth <martinroth(a)google.com> --- 3rdparty/chromeec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/chromeec b/3rdparty/chromeec index ea1a869..bcffec7 160000 --- a/3rdparty/chromeec +++ b/3rdparty/chromeec @@ -1 +1 @@ -Subproject commit ea1a8699e96425806abdd532d04da254ae093f6e +Subproject commit bcffec7fdc50e959cb298d094d8af472777dba75

1 0

Patch set updated for coreboot: Kconfig: Remind users to delete .config when switching boards
by Martin Roth 03 Jan '17

03 Jan '17

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17939 -gerrit commit a8e93e17ce50f84271d83ed12a18892341f0a097 Author: Martin Roth <martinroth(a)google.com> Date: Thu Dec 22 10:21:11 2016 -0700 Kconfig: Remind users to delete .config when switching boards Because Kconfig default values *ONLY* get set when they are first configured, if you switch mainboards with an existing .config, the values will not be set as expected for the new board. This seems to confuse most users, so put a warning in a visible location to let them know. Change-Id: Ie6a9c2d139ecd841d654943f14c119ebafd632f2 Signed-off-by: Martin Roth <martinroth(a)google.com> --- src/mainboard/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig index 24c1fe3..08af722 100644 --- a/src/mainboard/Kconfig +++ b/src/mainboard/Kconfig @@ -1,3 +1,5 @@ +comment "Important: Always start with an empty .config when switching mainboards" + choice prompt "Mainboard vendor" default VENDOR_EMULATION

1 0

Patch set updated for coreboot: .gitignore: Add utility binaries
by Martin Roth 03 Jan '17

03 Jan '17

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17991 -gerrit commit 6c71b13b0e32061569b92a256148577553b080b0 Author: Martin Roth <gaumless(a)gmail.com> Date: Thu Dec 29 12:02:26 2016 -0700 .gitignore: Add utility binaries Change-Id: Iad84eda9949a60bcbde092ad8f4d7cd0bcbdb942 Signed-off-by: Martin Roth <gaumless(a)gmail.com> --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index de22385..954382a 100644 --- a/.gitignore +++ b/.gitignore @@ -78,14 +78,18 @@ tarballs/ util/*/.dependencies util/*/.test util/amdfwtool/amdfwtool +/util/archive/archive +/util/bimgtool/bimgtool util/board_status/board-status util/cbfstool/cbfstool util/cbfstool/fmaptool +/util/cbfstool/ifwitool util/cbfstool/rmodtool util/cbmem/.dependencies util/cbmem/cbmem util/dumpmmcr/dumpmmcr util/ectool/ectool +util/futility/futility util/genprof/genprof util/getpir/getpir util/ifdtool/ifdtool

1 0

Patch set updated for coreboot: util/docker: Update dockerfiles & build method
by Martin Roth 03 Jan '17

03 Jan '17

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18001 -gerrit commit f04cef91813c0a3e01f02e2ae486e4142eb13633 Author: Martin Roth <gaumless(a)gmail.com> Date: Fri Dec 30 17:00:19 2016 -0700 util/docker: Update dockerfiles & build method All files: - Previously, various things were hardcoded into the docker containers that made it necessary to update the Dockerfile files for each new version of the sdk. Turn those into 'Variables" that are updated during the build step. Because the makefile is piping the dockerfile through the sed command and back into the docker build command, the normal docker "COPY" keyword doesn't work. coreboot-jenkins-node changes: - Run ssh-keygen -A to explicitly generate the ssh keys. This fixes an error: Could not load host key: /etc/ssh/ssh_host_dsa_key coreboot-sdk changes: - Remove apt-get upgrade command - The Dockerfile guide recommends not to run this. - Change libssl-dev to libssl1.0-dev. libssl-dev's header files won't build the Chrome-EC codebase. - Add libisl-dev, needed to build the riscv toolchain. - Build the toolchain using the -b option - Add environment variables containing the version and commit that the coreboot-sdk was built from. Makefile: - Update targets to use the version and commit variables Change-Id: I2c1376fe4b791da2a62fca11bc92c4774cbef1c8 Signed-off-by: Martin Roth <gaumless(a)gmail.com> --- util/docker/Makefile | 29 +++++++++++++++++++++------ util/docker/coreboot-jenkins-node/Dockerfile | 30 ++++++++++++++++++++++------ util/docker/coreboot-sdk/Dockerfile | 27 +++++++++++++++++++------ 3 files changed, 68 insertions(+), 18 deletions(-) diff --git a/util/docker/Makefile b/util/docker/Makefile index f669b93..756dac0 100644 --- a/util/docker/Makefile +++ b/util/docker/Makefile @@ -16,6 +16,12 @@ export top=$(abspath $(CURDIR)/../..) export crossgcc_version=$(shell $(top)/util/crossgcc/buildgcc --version | grep 'cross toolchain' | sed 's/^.*\sv//' | sed 's/\s.*$$//') export DOCKER:=$(shell env sh -c "command -v docker") +# Version of the jenkins / sdk container +export COREBOOT_CONTAINER_VERSION?=$(crossgcc_version) + +# Commit id to build from +export DOCKER_COMMIT?=$(shell git log -n 1 --pretty=%h) + test-docker: $(if $(DOCKER),,\ $(warning Docker command not found. Please install docker) \ @@ -28,16 +34,23 @@ test-docker-login: test-docker $(error Docker authentication file not found. Run 'docker login')) coreboot-sdk: test-docker - $(DOCKER) build -t coreboot/coreboot-sdk:$(crossgcc_version) coreboot-sdk + @echo "Building coreboot SDK $(crossgcc_version) from commit $(DOCKER_COMMIT)" + cat coreboot-sdk/Dockerfile | \ + sed "s/{{DOCKER_COMMIT}}/$(DOCKER_COMMIT)/" | \ + sed "s/{{SDK_VERSION}}/$(COREBOOT_CONTAINER_VERSION)/" | \ + $(DOCKER) build -t coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) - upload-coreboot-sdk: test-docker-login - $(DOCKER) push coreboot/coreboot-sdk:$(crossgcc_version) + $(DOCKER) push coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) coreboot-jenkins-node: test-docker - $(DOCKER) build -t coreboot/coreboot-jenkins-node:$(crossgcc_version) coreboot-jenkins-node + cat coreboot-jenkins-node/Dockerfile | \ + sed "s/{{SDK_VERSION}}/$(COREBOOT_CONTAINER_VERSION)/" | \ + sed "s|{{SSH_KEY}}|$$(cat coreboot-jenkins-node/authorized_keys)|" | \ + $(DOCKER) build -t coreboot/coreboot-jenkins-node:$(COREBOOT_CONTAINER_VERSION) - upload-coreboot-jenkins-node: test-docker-login - $(DOCKER) push coreboot/coreboot-jenkins-node:$(crossgcc_version) + $(DOCKER) push coreboot/coreboot-jenkins-node:$(COREBOOT_CONTAINER_VERSION) docker-killall: test-docker @if [ -n "$$($(DOCKER) ps | grep 'coreboot')" ]; then \ @@ -52,7 +65,7 @@ clean-coreboot-images: docker-killall docker-build-coreboot: test-docker $(DOCKER) run -u root -it -v $(top):/home/coreboot/coreboot \ - --rm coreboot/coreboot-sdk:$(crossgcc_version) \ + --rm coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) \ /bin/bash -c "cd /home/coreboot/coreboot && \ make clean && \ make $(BUILD_CMD)" @@ -62,7 +75,7 @@ docker-build-coreboot: test-docker docker-abuild: test-docker $(DOCKER) run -u root -it -v $(top):/home/coreboot/coreboot \ - --rm coreboot/coreboot-sdk:$(crossgcc_version) \ + --rm coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) \ /bin/bash -c "cd /home/coreboot/coreboot && \ make clean && \ util/abuild/abuild $(ABUILD_ARGS)" @@ -82,6 +95,10 @@ help: @echo "Commands for using docker images" @echo " docker-build-coreboot <BUILD_CMD=target> - Build coreboot under coreboot-sdk" @echo " docker-abuild <ABUILD_ARGS='-a -B'> - Run abuild under coreboot-sdk" + @echo + @echo "Variables:" + @echo " COREBOOT_CONTAINER_VERSION = $(COREBOOT_CONTAINER_VERSION)" + @echo " DOCKER_COMMIT = $(DOCKER_COMMIT)" .PHONY: test-docker test-docker-login .PHONY: coreboot-jenkins-node upload-coreboot-jenkins-node diff --git a/util/docker/coreboot-jenkins-node/Dockerfile b/util/docker/coreboot-jenkins-node/Dockerfile index b60466d..230842c 100644 --- a/util/docker/coreboot-jenkins-node/Dockerfile +++ b/util/docker/coreboot-jenkins-node/Dockerfile @@ -1,5 +1,20 @@ -FROM coreboot/coreboot-sdk:1.42 -MAINTAINER Martin Roth <gaumless(a)gmail.com> +# This dockerfile is not meant to be used directly by docker. The +# {{}} varibles are replaced with values by the makefile. Please generate +# the docker image for this file by running: +# +# make coreboot-jenkins-node +# +# Variables can be updated on the make command line or left blank to use +# the default values set by the makefile. +# +# SDK_VERSION is used to name the version of the coreboot sdk to use. +# Typically, this corresponds to the toolchain version. +# SSH_KEY is the contents of the file coreboot-jenkins-node/authorized_keys +# Because we're piping the contents of the dockerfile into the +# docker build command, the 'COPY' keyword isn't valid. + +FROM coreboot/coreboot-sdk:{{SDK_VERSION}} +MAINTAINER Martin Roth <martin(a)coreboot.org> USER root # Check to make sure /dev is a tmpfs file system @@ -10,13 +25,17 @@ RUN apt-get -y update && \ lua5.3 liblua5.3-dev openjdk-8-jre-headless openssh-server && \ apt-get clean -COPY authorized_keys /home/coreboot/.ssh/authorized_keys -RUN chown -R coreboot /home/coreboot/.ssh && \ +# Because of the way that the variables are being replaced, docker's 'COPY' +# command does not work +RUN mkdir -p /home/coreboot/.ssh && \ + echo "{{SSH_KEY}}" > /home/coreboot/.ssh/authorized_keys && \ + chown -R coreboot:coreboot /home/coreboot/.ssh && \ chmod 0700 /home/coreboot/.ssh && \ chmod 0600 /home/coreboot/.ssh/authorized_keys RUN mkdir /var/run/sshd && \ - chmod 0755 /var/run/sshd + chmod 0755 /var/run/sshd && \ + /usr/bin/ssh-keygen -A # Build encapsulate tool ADD https://raw.githubusercontent.com/pgeorgi/encapsulate/master/encapsulate.c /tmp/encapsulate.c @@ -24,7 +43,6 @@ RUN gcc -o /usr/sbin/encapsulate /tmp/encapsulate.c && \ chown root /usr/sbin/encapsulate && \ chmod +s /usr/sbin/encapsulate - VOLUME /data/cache ENTRYPOINT mkdir /dev/cb-build && chown coreboot /dev/cb-build && /usr/sbin/sshd -p 49151 -D EXPOSE 49151 diff --git a/util/docker/coreboot-sdk/Dockerfile b/util/docker/coreboot-sdk/Dockerfile index cb0023c..feaf843 100644 --- a/util/docker/coreboot-sdk/Dockerfile +++ b/util/docker/coreboot-sdk/Dockerfile @@ -1,26 +1,39 @@ +# This dockerfile is not meant to be used directly by docker. The +# {{}} varibles are replaced with values by the makefile. Please generate +# the docker image for this file by running: +# +# make coreboot-sdk +# +# Variables can be updated on the make command line or left blank to use +# the default values set by the makefile. +# +# SDK_VERSION is used to name the version of the coreboot sdk to use. +# Typically, this corresponds to the toolchain version. This +# is used to identify this docker image. +# DOCKER_COMMIT is the coreboot Commit-ID to build the toolchain from. + FROM debian:sid -MAINTAINER Martin Roth <gaumless(a)gmail.com> +MAINTAINER Martin Roth <martin(a)coreboot.org> RUN \ useradd -p locked -m coreboot && \ apt-get -qq update && \ - apt-get -qq upgrade && \ apt-get -qqy install gcc g++ make patch python diffutils bison flex \ git doxygen ccache subversion p7zip-full unrar-free \ m4 wget curl bzip2 vim-common cmake xz-utils pkg-config \ dh-autoreconf unifont \ - libssl-dev libgmp-dev zlib1g-dev libpci-dev liblzma-dev \ + libssl1.0-dev libgmp-dev zlib1g-dev libpci-dev liblzma-dev \ libyaml-dev libncurses5-dev uuid-dev libusb-dev libftdi-dev \ libusb-1.0-0-dev libreadline-dev libglib2.0-dev libgmp-dev \ - libelf-dev libxml2-dev libfreetype6-dev && \ + libelf-dev libxml2-dev libfreetype6-dev libisl-dev && \ apt-get clean RUN \ cd /root && \ git clone http://review.coreboot.org/coreboot && \ cd coreboot/util/crossgcc && \ - git checkout 589ef9de8fa && \ - make all_without_gdb CPUS=$(nproc) DEST=/opt/xgcc && \ + git checkout {{DOCKER_COMMIT}} && \ + make all_without_gdb CPUS=$(nproc) DEST=/opt/xgcc BUILDGCC_OPTIONS=-b && \ cd /root && \ rm -rf coreboot @@ -31,4 +44,6 @@ RUN mkdir /home/coreboot/.ccache && \ VOLUME /home/coreboot/.ccache ENV PATH $PATH:/opt/xgcc/bin +ENV SDK_VERSION={{SDK_VERSION}} +ENV SDK_COMMIT={{DOCKER_COMMIT}} USER coreboot

1 0

Patch set updated for coreboot: util/docker: Update makefile target names
by Martin Roth 03 Jan '17

03 Jan '17

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18000 -gerrit commit fd02183158256418aa9f484a2d3cb8998cac9ac6 Author: Martin Roth <gaumless(a)gmail.com> Date: Fri Dec 30 16:26:13 2016 -0700 util/docker: Update makefile target names - Use dashes instead of underscores for consistency and to match other coreboot targets - Fix a couple of places where old target names were referenced - Remove double 'help' target from .PHONEY target list Change-Id: I3b464ebf74653a8cc880e982316fd883757ec728 Signed-off-by: Martin Roth <gaumless(a)gmail.com> --- util/docker/Makefile | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/util/docker/Makefile b/util/docker/Makefile index 113e1ca..f669b93 100644 --- a/util/docker/Makefile +++ b/util/docker/Makefile @@ -16,42 +16,41 @@ export top=$(abspath $(CURDIR)/../..) export crossgcc_version=$(shell $(top)/util/crossgcc/buildgcc --version | grep 'cross toolchain' | sed 's/^.*\sv//' | sed 's/\s.*$$//') export DOCKER:=$(shell env sh -c "command -v docker") -test_docker: +test-docker: $(if $(DOCKER),,\ $(warning Docker command not found. Please install docker) \ $(warning https://docs.docker.com/engine/installation ) \ $(error halting)) -test_docker_login: test_docker +test-docker-login: test-docker $(if $(shell if [ ! -f ~/.docker/config.json ]; then \ echo "docker authentication file not found"; fi), \ $(error Docker authentication file not found. Run 'docker login')) -coreboot-sdk: test_docker +coreboot-sdk: test-docker $(DOCKER) build -t coreboot/coreboot-sdk:$(crossgcc_version) coreboot-sdk -upload-coreboot-sdk: test_docker_login +upload-coreboot-sdk: test-docker-login $(DOCKER) push coreboot/coreboot-sdk:$(crossgcc_version) -coreboot-jenkins-node: test_docker +coreboot-jenkins-node: test-docker $(DOCKER) build -t coreboot/coreboot-jenkins-node:$(crossgcc_version) coreboot-jenkins-node -upload-coreboot-jenkins-node: test_docker_login +upload-coreboot-jenkins-node: test-docker-login $(DOCKER) push coreboot/coreboot-jenkins-node:$(crossgcc_version) -docker-killall: test_docker +docker-killall: test-docker @if [ -n "$$($(DOCKER) ps | grep 'coreboot')" ]; then \ $(DOCKER) kill $$($(DOCKER) ps | grep 'coreboot' | cut -f1 -d ' '); \ fi -clean_coreboot_containers: docker-killall +clean-coreboot-containers: docker-killall $(DOCKER) rm $(docker ps -a | grep 'coreboot' | sed 's|\s.*$||') -clean_coreboot_images: docker-killall +clean-coreboot-images: docker-killall $(DOCKER) rmi $(docker images | grep coreboot | sed 's|^\S\+\s\+\S\+\s\+||' | sed 's|\s.*$||') -docker_build_coreboot: test_docker - +docker-build-coreboot: test-docker $(DOCKER) run -u root -it -v $(top):/home/coreboot/coreboot \ --rm coreboot/coreboot-sdk:$(crossgcc_version) \ /bin/bash -c "cd /home/coreboot/coreboot && \ @@ -61,7 +60,7 @@ docker_build_coreboot: test_docker @echo "Exiting now will leave built files owned by root" sudo chown -R $$(whoami):$$(id -gn $$(whoami)) $(top) -docker_abuild: test_docker +docker-abuild: test-docker $(DOCKER) run -u root -it -v $(top):/home/coreboot/coreboot \ --rm coreboot/coreboot-sdk:$(crossgcc_version) \ /bin/bash -c "cd /home/coreboot/coreboot && \ @@ -73,20 +72,20 @@ docker_abuild: test_docker help: @echo "Commands for working with docker images:" - @echo " build-coreboot-sdk - Build coreboot-sdk container" + @echo " coreboot-sdk - Build coreboot-sdk container" @echo " upload-coreboot-sdk - Upload coreboot-sdk to hub.docker.com" - @echo " build-coreboot-jenkins-node - Build coreboot-jenkins-node container" + @echo " coreboot-jenkins-node - Build coreboot-jenkins-node container" @echo " upload-coreboot-jenkins-node - Upload coreboot-jenkins-node to hub.docker.com" - @echo " clean_coreboot_containers - remove all docker coreboot containers" - @echo " clean_coreboot_images - remove all docker coreboot images" + @echo " clean-coreboot-containers - remove all docker coreboot containers" + @echo " clean-coreboot-images - remove all docker coreboot images" @echo @echo "Commands for using docker images" - @echo " docker_build_coreboot <BUILD_CMD=target> - Build coreboot under coreboot-sdk" - @echo " docker_abuild <ABUILD_ARGS='-a -B'> - Run abuild under coreboot-sdk" + @echo " docker-build-coreboot <BUILD_CMD=target> - Build coreboot under coreboot-sdk" + @echo " docker-abuild <ABUILD_ARGS='-a -B'> - Run abuild under coreboot-sdk" -.PHONY: test_docker test_docker_login help -.PHONY: build-coreboot-jenkins-node upload-coreboot-jenkins-node -.PHONY: build-coreboot-sdk upload-coreboot-sdk -.PHONY: clean_coreboot_containers clean_coreboot_images -.PHONY: docker_build_coreboot docker_abuild -.PHONY: help \ No newline at end of file +.PHONY: test-docker test-docker-login +.PHONY: coreboot-jenkins-node upload-coreboot-jenkins-node +.PHONY: coreboot-sdk upload-coreboot-sdk +.PHONY: clean-coreboot-containers clean-coreboot-images +.PHONY: docker-abuild +.PHONY: help

1 0

Patch set updated for coreboot: util/docker: Update makefile with command to kill docker images
by Martin Roth 03 Jan '17

03 Jan '17

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17999 -gerrit commit 2d8a6a41d2829cffc8f82a06967a8b7b7df160b8 Author: Martin Roth <gaumless(a)gmail.com> Date: Fri Dec 30 16:12:30 2016 -0700 util/docker: Update makefile with command to kill docker images Kill running docker containers before trying to remove images or containers. Change-Id: Id2de90edbe5d0dc6ecb906be7101ad9744dbd11e Signed-off-by: Martin Roth <gaumless(a)gmail.com> --- util/docker/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/util/docker/Makefile b/util/docker/Makefile index 45e23b0..113e1ca 100644 --- a/util/docker/Makefile +++ b/util/docker/Makefile @@ -39,10 +39,15 @@ coreboot-jenkins-node: test_docker upload-coreboot-jenkins-node: test_docker_login $(DOCKER) push coreboot/coreboot-jenkins-node:$(crossgcc_version) -clean_coreboot_containers: test_docker +docker-killall: test_docker + @if [ -n "$$($(DOCKER) ps | grep 'coreboot')" ]; then \ + $(DOCKER) kill $$($(DOCKER) ps | grep 'coreboot' | cut -f1 -d ' '); \ + fi + +clean_coreboot_containers: docker-killall $(DOCKER) rm $(docker ps -a | grep 'coreboot' | sed 's|\s.*$||') -clean_coreboot_images: test_docker +clean_coreboot_images: docker-killall $(DOCKER) rmi $(docker images | grep coreboot | sed 's|^\S\+\s\+\S\+\s\+||' | sed 's|\s.*$||') docker_build_coreboot: test_docker

1 0

New patch to review for coreboot: nb/x4x/raminit: Fix programming dram timings
by Arthur Heymans 03 Jan '17

03 Jan '17

Arthur Heymans (arthur(a)aheymans.xyz) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18022 -gerrit commit 3d7d53d9c8eb00d9d1a745adafd317105e1bcd90 Author: Arthur Heymans <arthur(a)aheymans.xyz> Date: Tue Jan 3 00:49:45 2017 +0100 nb/x4x/raminit: Fix programming dram timings Results obtained by comparing vendor bios with coreboot at same timings. This fixes 2 issues: * 1333MHz fsb CPUs were limited to 667MHz ddr2 speeds; * 1067MHz fsb CPUs can now boot with dimm in second slot. TESTED on ga-g41m-es2l on 800, 1067 and 1333MHz CPUs on DDR2 667 and 800MHz. Change-Id: I70f554f97b44947c2c78713b4d73a47c06d7ba60 Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- src/northbridge/intel/x4x/raminit.c | 4 +--- src/northbridge/intel/x4x/raminit_ddr2.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/northbridge/intel/x4x/raminit.c b/src/northbridge/intel/x4x/raminit.c index 122cab5..86f63f1 100644 --- a/src/northbridge/intel/x4x/raminit.c +++ b/src/northbridge/intel/x4x/raminit.c @@ -228,9 +228,7 @@ static void sdram_detect_ram_speed(struct sysinfo *s) // Max RAM speed if (s->spd_type == DDR2) { - // FIXME: Limit memory speed to 667MHz if FSB is 1333MHz - maxfreq = (s->max_fsb == FSB_CLOCK_1333MHz) - ? MEM_CLOCK_667MHz : MEM_CLOCK_800MHz; + maxfreq = MEM_CLOCK_800MHz; // Choose common CAS latency from {6,5}, 4 does not work commoncas = 0x60; diff --git a/src/northbridge/intel/x4x/raminit_ddr2.c b/src/northbridge/intel/x4x/raminit_ddr2.c index dd10e3f..42c755f 100644 --- a/src/northbridge/intel/x4x/raminit_ddr2.c +++ b/src/northbridge/intel/x4x/raminit_ddr2.c @@ -532,6 +532,9 @@ static void timings_ddr2(struct sysinfo *s) u8 trpmod = 0; u8 bankmod = 1; u8 pagemod = 0; + u8 adjusted_cas; + + adjusted_cas = s->selected_timings.CAS - 3; u16 fsb2ps[3] = { 5000, // 800 @@ -575,13 +578,14 @@ static void timings_ddr2(struct sysinfo *s) } FOR_EACH_POPULATED_CHANNEL(s->dimms, i) { - MCHBAR8(0x400*i + 0x2f6) = MCHBAR8(0x400*i + 0x2f6) | 0x3; + MCHBAR8(0x400*i + 0x26f) = MCHBAR8(0x400*i + 0x26f) | 0x3; MCHBAR8(0x400*i + 0x228) = (MCHBAR8(0x400*i + 0x228) & ~0x7) | 0x2; - MCHBAR8(0x400*i + 0x240) = (MCHBAR8(0x400*i + 0x240) & ~0xf0) | (twl << 4); + MCHBAR8(0x400*i + 0x240) = (MCHBAR8(0x400*i + 0x240) & ~0xf0) + | (0 << 4); MCHBAR8(0x400*i + 0x240) = (MCHBAR8(0x400*i + 0x240) & ~0xf) | - s->selected_timings.CAS; + adjusted_cas; MCHBAR16(0x400*i + 0x265) = (MCHBAR16(0x400*i + 0x265) & ~0x3f00) | - ((s->selected_timings.CAS + 9) << 8); + ((adjusted_cas + 9) << 8); reg16 = (s->selected_timings.tRAS << 11) | ((twl + 4 + s->selected_timings.tWR) << 6) | @@ -661,7 +665,7 @@ static void timings_ddr2(struct sysinfo *s) fsb = fsb2ps[s->selected_timings.fsb_clk]; ddr = ddr2ps[s->selected_timings.mem_clk]; - reg32 = (u32)((s->selected_timings.CAS + 7 + reg8) * ddr); + reg32 = (u32)((adjusted_cas + 7 + reg8) * ddr); reg32 = (u32)((reg32 / fsb) << 8); reg32 |= 0x0e000000; if ((fsb2mhz(s->selected_timings.fsb_clk) / @@ -739,7 +743,7 @@ static void timings_ddr2(struct sysinfo *s) MCHBAR32(0x120) = (2 << 29) | (1 << 28) | (1 << 23) | 0xd7f5f; reg8 = (u8)((MCHBAR32(0x252) & 0x1e000) >> 13); MCHBAR8(0x12d) = (MCHBAR8(0x12d) & ~0xf0) | (reg8 << 4); - reg8 = (u8)((MCHBAR32(0x258) & ~0x1e0000) >> 17); + reg8 = (u8)((MCHBAR32(0x258) & 0x1e0000) >> 17); MCHBAR8(0x12d) = (MCHBAR8(0x12d) & ~0xf) | reg8; MCHBAR8(0x12f) = 0x4c; reg32 = (1 << 31) | (0x80 << 14) | (1 << 13) | (0xa << 9);

1 0

Patch set updated for coreboot: [not for merge]src/cpu/intel: Add Pentium 4 model F6x
by HAOUAS Elyes 02 Jan '17

02 Jan '17

HAOUAS Elyes (ehaouas(a)noos.fr) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17410 -gerrit commit a07ba1d9f32f41a2bf386fbd009e36eddd9ca93a Author: Elyes HAOUAS <ehaouas(a)noos.fr> Date: Mon Jan 2 21:57:13 2017 +0100 [not for merge]src/cpu/intel: Add Pentium 4 model F6x This is a modfied copy of model_F4x. Change-Id: I9c691db73e3ec44895f623ede5a7ee04c13e1851 Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- src/cpu/intel/Kconfig | 1 + src/cpu/intel/model_f6x/Kconfig | 8 +++++ src/cpu/intel/model_f6x/Makefile.inc | 3 ++ src/cpu/intel/model_f6x/model_f6x_init.c | 60 ++++++++++++++++++++++++++++++++ src/cpu/intel/socket_LGA775/Makefile.inc | 2 +- 5 files changed, 73 insertions(+), 1 deletion(-) diff --git a/src/cpu/intel/Kconfig b/src/cpu/intel/Kconfig index 138da8c..406da56 100644 --- a/src/cpu/intel/Kconfig +++ b/src/cpu/intel/Kconfig @@ -19,6 +19,7 @@ source src/cpu/intel/model_f1x/Kconfig source src/cpu/intel/model_f2x/Kconfig source src/cpu/intel/model_f3x/Kconfig source src/cpu/intel/model_f4x/Kconfig +source src/cpu/intel/model_f6x/Kconfig source src/cpu/intel/ep80579/Kconfig source src/cpu/intel/haswell/Kconfig # Sockets/Slots diff --git a/src/cpu/intel/model_f6x/Kconfig b/src/cpu/intel/model_f6x/Kconfig new file mode 100644 index 0000000..ede6a4a --- /dev/null +++ b/src/cpu/intel/model_f6x/Kconfig @@ -0,0 +1,8 @@ +config CPU_INTEL_MODEL_F6X + bool + select ARCH_BOOTBLOCK_X86_32 + select ARCH_VERSTAGE_X86_32 + select ARCH_ROMSTAGE_X86_32 + select ARCH_RAMSTAGE_X86_32 + select SMP + select SUPPORT_CPU_UCODE_IN_CBFS diff --git a/src/cpu/intel/model_f6x/Makefile.inc b/src/cpu/intel/model_f6x/Makefile.inc new file mode 100644 index 0000000..30eab55 --- /dev/null +++ b/src/cpu/intel/model_f6x/Makefile.inc @@ -0,0 +1,3 @@ +ramstage-y += model_f6x_init.c + +//cpu_microcode_bins += 3rdparty/blobs/cpu/intel/model_f6x/microcode.bin /* missing microcode for CPUID 0F6x */ diff --git a/src/cpu/intel/model_f6x/model_f6x_init.c b/src/cpu/intel/model_f6x/model_f6x_init.c new file mode 100644 index 0000000..725e4ff --- /dev/null +++ b/src/cpu/intel/model_f6x/model_f6x_init.c @@ -0,0 +1,60 @@ +/* + * This file is part of the coreboot project. + * + * 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. + */ + +#include <console/console.h> +#include <device/device.h> +#include <string.h> +#include <cpu/cpu.h> +#include <cpu/x86/mtrr.h> +#include <cpu/x86/msr.h> +#include <cpu/x86/lapic.h> +#include <cpu/intel/microcode.h> +#include <cpu/intel/hyperthreading.h> +#include <cpu/x86/cache.h> + +static void model_f6x_init(struct device *cpu) +{ + /* Turn on caching if we haven't already */ + x86_enable_cache(); + + if (!intel_ht_sibling()) { + /* MTRRs are shared between threads */ + x86_setup_mtrrs(); + x86_mtrr_check(); + + /* Update the microcode */ + intel_update_microcode_from_cbfs(); + } + + /* Enable the local CPU APICs */ + setup_lapic(); + + /* Start up my CPU siblings */ + intel_sibling_init(cpu); +}; + +static struct device_operations cpu_dev_ops = { + .init = model_f6x_init, +}; + +static struct cpu_device_id cpu_table[] = { + { X86_VENDOR_INTEL, 0x0f62 }, + { X86_VENDOR_INTEL, 0x0f64 }, + { X86_VENDOR_INTEL, 0x0f65 }, + { 0, 0 }, +}; + +static const struct cpu_driver model_f6x __cpu_driver = { + .ops = &cpu_dev_ops, + .id_table = cpu_table, +}; diff --git a/src/cpu/intel/socket_LGA775/Makefile.inc b/src/cpu/intel/socket_LGA775/Makefile.inc index ffcd1cb..8eef023 100644 --- a/src/cpu/intel/socket_LGA775/Makefile.inc +++ b/src/cpu/intel/socket_LGA775/Makefile.inc @@ -1,7 +1,7 @@ subdirs-y += ../model_6fx subdirs-y += ../model_f3x subdirs-y += ../model_f4x -#subdirs-y += ../model_f6x +subdirs-y += ../model_f6x #subdirs-y += ../model_1066x subdirs-y += ../model_1067x subdirs-y += ../../x86/tsc

1 0

Patch set updated for coreboot: cpu/intel/speedstep/acpi.c: Add Netburst CPUs
by HAOUAS Elyes 02 Jan '17

02 Jan '17

HAOUAS Elyes (ehaouas(a)noos.fr) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18019 -gerrit commit b428282366c11d166ecb8551c672a25507a8c0f0 Author: Elyes HAOUAS <ehaouas(a)noos.fr> Date: Mon Jan 2 21:00:59 2017 +0100 cpu/intel/speedstep/acpi.c: Add Netburst CPUs MSR(0x2c) provides information abour FSB frequency Change-Id: I42b0dcfdd62e07422acb77462aefc2d9b62fba19 Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- src/cpu/intel/speedstep/acpi.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/cpu/intel/speedstep/acpi.c b/src/cpu/intel/speedstep/acpi.c index d85e487..936e21a 100644 --- a/src/cpu/intel/speedstep/acpi.c +++ b/src/cpu/intel/speedstep/acpi.c @@ -49,7 +49,17 @@ static int determine_total_number_of_cores(void) */ static int get_fsb(void) { - const u32 fsbcode = rdmsr(MSR_FSB_FREQ).lo & 7; + u32 fsbcode; + const u32 eax; + msr_t msr; + + if (((eax >> 8) & 0xf) == 0xf) { + msr = rdmsr(0x2c); + fsbcode = (msr.lo >> 16) & 7; + } else { + fsbcode = rdmsr(MSR_FSB_FREQ).lo & 7; + } + switch (fsbcode) { case 0: return 800; /* / 3 == 266 */ case 1: return 400; /* / 3 == 133 */

1 0

New patch to review for coreboot: util/romcc: remove dead assignments
by Patrick Georgi 02 Jan '17

02 Jan '17

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18021 -gerrit commit 84c527ae92687e2d61402e8ba0a3524c86fdebd0 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Mon Jan 2 21:39:43 2017 +0100 util/romcc: remove dead assignments Change-Id: Iab6fe065faeacfca3b41eb5bae1075dcfb1a2b05 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> Found-by: scan-build (clang 3.8) --- util/romcc/romcc.c | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/util/romcc/romcc.c b/util/romcc/romcc.c index 517ad2a..edeba17 100644 --- a/util/romcc/romcc.c +++ b/util/romcc/romcc.c @@ -5401,7 +5401,7 @@ static void preprocess(struct compile_state *state, struct token *current_token) } /* Remember the start of the macro body */ - tok = raw_peek(state); + raw_peek(state); mend = mstart = get_token(state, 1)->pos; /* Find the end of the macro */ @@ -5467,7 +5467,6 @@ static void preprocess(struct compile_state *state, struct token *current_token) { char *name; int local; - local = 0; name = 0; pp_eat(state, TOK_MINCLUDE); @@ -5871,7 +5870,6 @@ static void name_of(FILE *fp, struct type *type) static size_t align_of(struct compile_state *state, struct type *type) { size_t align; - align = 0; switch(type->type & TYPE_MASK) { case TYPE_VOID: align = 1; @@ -5927,7 +5925,6 @@ static size_t align_of(struct compile_state *state, struct type *type) static size_t reg_align_of(struct compile_state *state, struct type *type) { size_t align; - align = 0; switch(type->type & TYPE_MASK) { case TYPE_VOID: align = 1; @@ -6032,7 +6029,6 @@ static size_t reg_needed_padding(struct compile_state *state, static size_t size_of(struct compile_state *state, struct type *type) { size_t size; - size = 0; switch(type->type & TYPE_MASK) { case TYPE_VOID: size = 0; @@ -6118,7 +6114,6 @@ static size_t size_of(struct compile_state *state, struct type *type) static size_t reg_size_of(struct compile_state *state, struct type *type) { size_t size; - size = 0; switch(type->type & TYPE_MASK) { case TYPE_VOID: size = 0; @@ -6368,7 +6363,6 @@ static size_t index_offset(struct compile_state *state, i = 0; while(member && ((member->type & TYPE_MASK) == TYPE_OVERLAP)) { if (i == index) { - member = member->left; break; } i++; @@ -6421,7 +6415,6 @@ static size_t index_reg_offset(struct compile_state *state, i = 0; while(member && ((member->type & TYPE_MASK) == TYPE_OVERLAP)) { if (i == index) { - member = member->left; break; } i++; @@ -9165,7 +9158,6 @@ static void decompose_compound_types(struct compile_state *state) { struct triple *ins, *next, *first; first = state->first; - ins = first; /* Pass one expand compound values into pseudo registers. */ @@ -10535,9 +10527,9 @@ static void register_builtin_function(struct compile_state *state, if ((rtype->type & TYPE_MASK) != TYPE_VOID) { work = write_expr(state, deref_index(state, result, 1), work); } - work = flatten(state, first, work); + flatten(state, first, work); flatten(state, first, label(state)); - ret = flatten(state, first, ret); + flatten(state, first, ret); name_len = strlen(name); ident = lookup(state, name, name_len); ftype->type_ident = ident; @@ -13373,7 +13365,7 @@ static struct triple *function_definition( /* Add in the return instruction */ ret = triple(state, OP_RET, &void_type, read_expr(state, retvar), 0); - ret = flatten(state, first, ret); + flatten(state, first, ret); /* Walk through the parameters and create symbol table entries * for them. @@ -14050,7 +14042,7 @@ static int lookup_closure_index(struct compile_state *state, { struct triple *first, *ins, *next; first = RHS(me, 0); - ins = next = first; + next = first; do { struct triple *result; struct triple *index0, *index1, *index2, *read, *write; @@ -14070,7 +14062,6 @@ static int lookup_closure_index(struct compile_state *state, (result->id & TRIPLE_FLAG_LOCAL)) { continue; } - index0 = ins->next->next; /* The pattern is: * 0 index result < 0 > * 1 index 0 < ? > @@ -14578,7 +14569,6 @@ static int do_inline(struct compile_state *state, struct triple *func) } break; default: - do_inline = 0; internal_error(state, 0, "Unimplemented inline policy"); break; } @@ -14606,7 +14596,7 @@ static void inline_function(struct compile_state *state, struct triple *me, void } first = RHS(me, 0); - ptr = next = first; + next = first; do { struct triple *func, *prev; ptr = next; @@ -14641,7 +14631,7 @@ static void inline_function(struct compile_state *state, struct triple *me, void next = prev->next; } while (next != first); - ptr = next = first; + next = first; do { struct triple *prev, *func; ptr = next; @@ -18048,7 +18038,7 @@ static void insert_mandatory_copies(struct compile_state *state) reg = REG_UNSET; regcm = arch_type_to_regcm(state, ins->type); - do_post_copy = do_pre_copy = 0; + do_pre_copy = 0; /* Walk through the uses of ins and check for conflicts */ for(entry = ins->use; entry; entry = next) { @@ -21914,7 +21904,6 @@ static int arch_encode_flag(struct arch_state *arch, const char *flag) int act; act = 1; - result = -1; if (strncmp(flag, "no-", 3) == 0) { flag += 3; act = 0; @@ -22392,7 +22381,6 @@ static unsigned arch_type_to_regcm(struct compile_state *state, struct type *typ #warning "FIXME force types smaller (if legal) before I get here" #endif unsigned mask; - mask = 0; switch(type->type & TYPE_MASK) { case TYPE_ARRAY: case TYPE_VOID: @@ -23881,7 +23869,6 @@ static long get_mask_pool_ref( ref = 2; } else { - ref = 0; internal_error(state, ins, "unhandled mask value"); } return ref; @@ -23952,7 +23939,6 @@ static void print_op_in(struct compile_state *state, struct triple *ins, FILE *f const char *op; int mask; int dreg; - mask = 0; switch(ins->op) { case OP_INB: op = "inb", mask = REGCM_GPR8_LO; break; case OP_INW: op = "inw", mask = REGCM_GPR16; break; @@ -23990,7 +23976,6 @@ static void print_op_out(struct compile_state *state, struct triple *ins, FILE * const char *op; int mask; int lreg; - mask = 0; switch(ins->op) { case OP_OUTB: op = "outb", mask = REGCM_GPR8_LO; break; case OP_OUTW: op = "outw", mask = REGCM_GPR16; break; @@ -24569,7 +24554,6 @@ static void print_op_branch(struct compile_state *state, #if DEBUG_ROMCC_WARNINGS #warning "FIXME I have observed instructions between the test and branch instructions" #endif - ptr = RHS(branch, 0); for(ptr = RHS(branch, 0)->next; ptr != branch; ptr = ptr->next) { if (ptr->op != OP_COPY) { internal_error(state, branch, "branch does not follow test");

1 0

← Newer
1
...
79
80
81
82
83
84
85
86
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit January 2017