Fix boot up on ARMADA38X uniprocessor variant
ClosedPublic
Actions

Authored by mw_semihalf.com on May 17 2017, 10:55 PM.

Details

Reviewers

zbb
loos

Commits

rS318526: Fix boot up on ARMADA38X uniprocessor variant

Summary

Marvell Armada 380 is a uni-processor variant of the A38x SoC
family. A function platform_mp_setmaxid() was setting a hardcoded
value, which caused boot fail on A380. Fix this by relying on
the CPU count obtained from the device tree nodes.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

mw_semihalf.com created this revision.May 17 2017, 10:55 PM

Herald added subscribers: andrew, imp. · View Herald TranscriptMay 17 2017, 10:55 PM

While here, don't you want to add support for the 'hw.ncpu' tunable ?

This revision is now accepted and ready to land.May 18 2017, 6:24 PM

Closed by commit rS318526: Fix boot up on ARMADA38X uniprocessor variant (authored by wma). · Explain WhyMay 19 2017, 8:26 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

head/

sys/

arm/

mv/

armada38x/

armada38x_mp.c

2 lines

Diff 28558

View Options

head/sys/arm/mv/armada38x/armada38x_mp.c

This file was added.

Property	Old Value	New Value
File Mode	null	100755

				#!/bin/sh

				/usr/bin/sed -i.bak "$@"
				for x in "${@}" ; do
				tobikUnsubmitted Done Inline Actions This script always has exit status 0 which means that the blackbox behavior now differs when DEVELOPER is set and when it is not. If I introduce a syntax error in a sed expression the build will continue unpatched anyway when it probably should abort like before. Maybe add `set -e` or `\|\| exit 1` to the script or handle the error case in some other way. tobik: This script always has exit status 0 which means that the blackbox behavior now differs when…
				swillsAuthorUnsubmitted Done Inline Actions Sure, that's fine. swills: Sure, that's fine.
				if [ -f "${x}" ]; then
				if cmp "${x}" "${x}".bak > /dev/null 2>&1 ; then
				matUnsubmitted Done Inline Actions cmp as a silent mode: if cmp -s "${x}" "${x}".bak ; then mat: cmp as a silent mode: ``` if cmp -s "${x}" "${x}".bak ; then ```
				if [ ! -z "${REWARNFILE}" ]; then
				echo sed failed: backup file same as original: ${x} >> ${REWARNFILE}
				fi
				bdreweryUnsubmitted Done Inline Actions `[ -f $blah ]` doesn't generate output so the redirections aren't needed. bdrewery: `[ -f $blah ]` doesn't generate output so the redirections aren't needed.
				tobikUnsubmitted Done Inline Actions Every file flagged here will always be prefixed with ${WRKDIR} which seems redundant. WRKDIR can also be a pretty long path. Would it make sense to strip it like what is done in the shebang and symlink checks in qa.sh? tobik: Every file flagged here will always be prefixed with ${WRKDIR} which seems redundant. WRKDIR…
				swillsAuthorUnsubmitted Done Inline Actions Good idea. swills: Good idea.
				fi
				matUnsubmitted Done Inline Actions if !cmp "${x}" "${x}".bak > /dev/null 2>&1; then (or maybe without the `!`, not sure) mat: ``` if !cmp "${x}" "${x}".bak > /dev/null 2>&1; then ``` (or maybe without the `!`, not sure)
				fi
				done
				bdreweryUnsubmitted Not Done Inline Actions You quoted the first `if [ -f` but then lost quotes everywhere else. It will be significant with filenames with spaces or globbing characters. Unlikely but trivial to avoid the problem. bdrewery: You quoted the first `if [ -f` but then lost quotes everywhere else. It will be significant…

Fix boot up on ARMADA38X uniprocessor variantClosedPublicActions